diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..8286f5f
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,6 @@
+[*]
+charset=utf-8
+end_of_line=lf
+insert_final_newline=false
+indent_style=space
+indent_size=2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3537b26
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/.idea/
+/.gradle/
+/build/
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..225b42b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,84 @@
+### About Fernflower
+
+Fernflower is the first actually working analytical decompiler for Java and 
+probably for a high-level programming language in general. Naturally it is still 
+under development, please send your bug reports and improvement suggestions to the
+[issue tracker](https://youtrack.jetbrains.com/newIssue?project=IDEA&clearDraft=true&c=Subsystem+Decompiler).
+
+### Licence
+
+Fernflower is licenced under the [Apache Licence Version 2.0](http://www.apache.org/licenses/LICENSE-2.0).
+
+### Running from command line
+
+`java -jar fernflower.jar [-<option>=<value>]* [<source>]+ <destination>`
+
+\* means 0 or more times\
+\+ means 1 or more times
+
+\<source>: file or directory with files to be decompiled. Directories are recursively scanned. Allowed file extensions are class, zip and jar.
+          Sources prefixed with -e= mean "library" files that won't be decompiled, but taken into account when analysing relationships between 
+          classes or methods. Especially renaming of identifiers (s. option 'ren') can benefit from information about external classes.          
+
+\<destination>: destination directory 
+
+\<option>, \<value>: a command-line option with the corresponding value (see "Command-line options" below).
+
+##### Examples:
+
+`java -jar fernflower.jar -hes=0 -hdc=0 c:\Temp\binary\ -e=c:\Java\rt.jar c:\Temp\source\`
+
+`java -jar fernflower.jar -dgs=1 c:\Temp\binary\library.jar c:\Temp\binary\Boot.class c:\Temp\source\`
+
+### Command-line options
+
+With the exception of mpm and urc the value of 1 means the option is activated, 0 - deactivated. Default 
+value, if any, is given between parentheses.
+
+Typically, the following options will be changed by user, if any: hes, hdc, dgs, mpm, ren, urc 
+The rest of options can be left as they are: they are aimed at professional reverse engineers.
+
+- rbr (1): hide bridge methods
+- rsy (0): hide synthetic class members
+- din (1): decompile inner classes
+- dc4 (1): collapse 1.4 class references
+- das (1): decompile assertions
+- hes (1): hide empty super invocation
+- hdc (1): hide empty default constructor
+- dgs (0): decompile generic signatures
+- ner (1): assume return not throwing exceptions
+- den (1): decompile enumerations
+- rgn (1): remove getClass() invocation, when it is part of a qualified new statement
+- lit (0): output numeric literals "as-is"
+- asc (0): encode non-ASCII characters in string and character literals as Unicode escapes
+- bto (1): interpret int 1 as boolean true (workaround to a compiler bug)
+- nns (0): allow for not set synthetic attribute (workaround to a compiler bug)
+- uto (1): consider nameless types as java.lang.Object (workaround to a compiler architecture flaw)
+- udv (1): reconstruct variable names from debug information, if present
+- rer (1): remove empty exception ranges
+- fdi (1): de-inline finally structures
+- mpm (0): maximum allowed processing time per decompiled method, in seconds. 0 means no upper limit
+- ren (0): rename ambiguous (resp. obfuscated) classes and class elements
+- urc (-): full name of a user-supplied class implementing IIdentifierRenamer interface. It is used to determine which class identifiers
+           should be renamed and provides new identifier names (see "Renaming identifiers")
+- inn (1): check for IntelliJ IDEA-specific @NotNull annotation and remove inserted code if found
+- lac (0): decompile lambda expressions to anonymous classes
+- nls (0): define new line character to be used for output. 0 - '\r\n' (Windows), 1 - '\n' (Unix), default is OS-dependent
+- ind: indentation string (default is 3 spaces)
+- log (INFO): a logging level, possible values are TRACE, INFO, WARN, ERROR
+
+### Renaming identifiers
+
+Some obfuscators give classes and their member elements short, meaningless and above all ambiguous names. Recompiling of such
+code leads to a great number of conflicts. Therefore it is advisable to let the decompiler rename elements in its turn, 
+ensuring uniqueness of each identifier.
+
+Option 'ren' (i.e. -ren=1) activates renaming functionality. Default renaming strategy goes as follows:
+- rename an element if its name is a reserved word or is shorter than 3 characters
+- new names are built according to a simple pattern: (class|method|field)_\<consecutive unique number>  
+You can overwrite this rules by providing your own implementation of the 4 key methods invoked by the decompiler while renaming. Simply 
+pass a class that implements org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer in the option 'urc'
+(e.g. -urc=com.example.MyRenamer) to Fernflower. The class must be available on the application classpath.
+
+The meaning of each method should be clear from naming: toBeRenamed determine whether the element will be renamed, while the other three
+provide new names for classes, methods and fields respectively.  
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..e6483db
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,24 @@
+apply plugin: 'java'
+
+compileJava {
+  sourceCompatibility '1.8'
+  targetCompatibility '1.8'
+}
+
+sourceSets {
+  main.java.srcDirs 'src'
+  test.java.srcDirs 'test'
+}
+
+repositories { jcenter() }
+dependencies {
+  testCompile 'junit:junit:4.+'
+  testCompile 'org.assertj:assertj-core:3.+'
+}
+
+jar {
+  archiveName 'fernflower.jar'
+  manifest {
+    attributes 'Main-Class': 'org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler'
+  }
+}
\ No newline at end of file
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 33000ff..0000000
--- a/build.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Fernflower" default="dist" basedir=".">
-
-  <target name="init">
-    <property name="src" value="${basedir}/src"/>
-    <property name="out" value="${basedir}/out/production"/>
-    <property name="dist" value="${basedir}/fernflower.jar"/>
-    <property name="test-src" value="${basedir}/test"/>
-    <property name="test-out" value="${basedir}/out/test"/>
-  </target>
-
-  <!-- external dependencies, adjust to your own -->
-  <path id="junit">
-    <file name="${basedir}/../../../lib/junit-4.12.jar"/>
-    <file name="${basedir}/../../../lib/hamcrest-core-1.3.jar"/>
-    <file name="${basedir}/../../../lib/hamcrest-library-1.3.jar"/>
-  </path>
-
-  <target name="clean" depends="init">
-    <delete includeemptydirs="true" failonerror="false">
-      <fileset dir="${out}"/>
-      <fileset dir="${test-out}"/>
-      <fileset file="${dist}"/>
-    </delete>
-  </target>
-
-  <target name="compile" depends="init,clean">
-    <mkdir dir="${out}"/>
-    <javac srcdir="${src}" destdir="${out}" source="1.7" target="1.7" encoding="UTF-8" debug="true" includeantruntime="false"/>
-  </target>
-
-  <target name="dist" depends="init,compile">
-    <jar jarfile="${dist}" compress="true" basedir="${out}" includes="**/*.class">
-      <manifest>
-        <attribute name="Main-Class" value="org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="test-compile" depends="init,compile">
-    <mkdir dir="${test-out}"/>
-    <javac srcdir="${test-src}" destdir="${test-out}" source="1.7" target="1.7" encoding="UTF-8" debug="true" includeantruntime="false">
-      <classpath path="${out}"/>
-      <classpath refid="junit"/>
-    </javac>
-  </target>
-
-  <target name="test" depends="init,test-compile">
-    <junit printsummary="true" failureproperty="tests.failed">
-      <classpath path="${test-out}:${out}"/>
-      <classpath refid="junit"/>
-      <batchtest>
-        <fileset dir="${test-src}" includes="**/*Test.java"/>
-      </batchtest>
-    </junit>
-    <fail if="tests.failed" message="Tests failed."/>
-  </target>
-
-</project>
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..cd13592
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..657de85
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Nov 28 14:11:56 CET 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..cccdd3d
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..f955316
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/java-decompiler-engine.iml b/intellij.java.decompiler.engine.iml
similarity index 88%
rename from java-decompiler-engine.iml
rename to intellij.java.decompiler.engine.iml
index d56249d..8daf525 100644
--- a/java-decompiler-engine.iml
+++ b/intellij.java.decompiler.engine.iml
@@ -9,5 +9,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+    <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
deleted file mode 100644
index cd47656..0000000
--- a/readme.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-1. About the decompiler 
-
-Fernflower is the first actually working analytical decompiler for Java and 
-probably for a high-level programming language in general. Naturally it is still 
-under development, please send your bug reports and improvement suggestions at 
-fernflower.decompiler@gmail.com
-
-
-2. License
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-
-3. Running from the command line
-
-java -jar fernflower.jar [-<option>=<value>]* [<source>]+ <destination>
-
-* means 0 or more times
-+ means 1 or more times
-
-<source>: file or directory with files to be decompiled. Directories are recursively scanned. Allowed file extensions are class, zip and jar.
-          Sources prefixed with -e= mean "library" files that won't be decompiled, but taken into account when analysing relationships between 
-          classes or methods. Especially renaming of identifiers (s. option 'ren') can benefit from information about external classes.          
-<destination>: destination directory 
-<option>,<value>: command line option with the corresponding value, see 4.
-
-Examples:
-
-java -jar fernflower.jar -hes=0 -hdc=0 c:\Temp\binary\ -e=c:\Java\rt.jar c:\Temp\source\
-
-java -jar fernflower.jar -dgs=1 c:\Temp\binary\library.jar c:\Temp\binary\Boot.class c:\Temp\source\
-
-
-4. Command line options
-
-With the exception of mpm and urc the value of 1 means the option is activated, 0 - deactivated. Default 
-value, if any, is given between parentheses.
-
-Typically, the following options will be changed by user, if any: hes, hdc, dgs, mpm, ren, urc 
-The rest of options can be left as they are: they are aimed at professional reverse engineers.
-
-rbr (1): hide bridge methods
-rsy (0): hide synthetic class members
-din (1): decompile inner classes
-dc4 (1): collapse 1.4 class references
-das (1): decompile assertions
-hes (1): hide empty super invocation
-hdc (1): hide empty default constructor
-dgs (0): decompile generic signatures
-ner (1): assume return not throwing exceptions
-den (1): decompile enumerations
-rgn (1): remove getClass() invocation, when it is part of a qualified new statement
-lit (0): output numeric literals "as-is"
-asc (0): encode non-ASCII characters in string and character literals as Unicode escapes
-bto (1): interpret int 1 as boolean true (workaround to a compiler bug)
-nns (1): allow for not set synthetic attribute (workaround to a compiler bug)
-uto (1): consider nameless types as java.lang.Object (workaround to a compiler architecture flaw)
-udv (1): reconstruct variable names from debug information, if present
-rer (1): remove empty exception ranges
-fdi (1): de-inline finally structures
-mpm (0): maximum allowed processing time per decompiled method, in seconds. 0 means no upper limit
-ren (0): rename ambiguous (resp. obfuscated) classes and class elements
-urc    : full name of user-supplied class implementing IIdentifierRenamer. It is used to determine which class identifiers
-         should be renamed and provides new identifier names. For more information see section 5
-inn (1): check for IntelliJ IDEA-specific @NotNull annotation and remove inserted code if found
-lac (0): decompile lambda expressions to anonymous classes
-nls (0): define new line character to be used for output. 0 - '\r\n' (Windows), 1 - '\n' (Unix), default is OS-dependent
-ind    : indentation string (default is "   " (3 spaces))
- 
-The default logging level is INFO. This value can be overwritten by setting the option 'log' as follows:
-log (INFO): possible values TRACE, INFO, WARN, ERROR
-
-
-5. Renaming identifiers
-
-Some obfuscators give classes and their member elements short, meaningless and above all ambiguous names. Recompiling of such
-code leads to a great number of conflicts. Therefore it is advisable to let the decompiler rename elements in its turn, 
-ensuring uniqueness of each identifier.
-
-Option 'ren' (i.e. -ren=1) activates renaming functionality. Default renaming strategy goes as follows:
-- rename an element if its name is a reserved word or is shorter than 3 characters
-- new names are built according to a simple pattern: (class|method|field)_<consecutive unique number>  
-You can overwrite this rules by providing your own implementation of the 4 key methods invoked by the decompiler while renaming. Simply 
-pass a class that implements org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer in the option 'urc'
-(e.g. -urc=com.mypackage.MyRenamer) to Fernflower. The class must be available on the application classpath.
-
-The meaning of each method should be clear from naming: toBeRenamed determine whether the element will be renamed, while the other three
-provide new names for classes, methods and fields respectively.  
diff --git a/src/org/jetbrains/java/decompiler/code/CodeConstants.java b/src/org/jetbrains/java/decompiler/code/CodeConstants.java
index 18d1ddb..720d2a7 100644
--- a/src/org/jetbrains/java/decompiler/code/CodeConstants.java
+++ b/src/org/jetbrains/java/decompiler/code/CodeConstants.java
@@ -1,31 +1,22 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
+@SuppressWarnings({"unused", "SpellCheckingInspection"})
 public interface CodeConstants {
-
   // ----------------------------------------------------------------------
   // BYTECODE VERSIONS
   // ----------------------------------------------------------------------
 
-  int BYTECODE_JAVA_LE_4 = 1;
-  int BYTECODE_JAVA_5 = 2;
-  int BYTECODE_JAVA_6 = 3;
-  int BYTECODE_JAVA_7 = 4;
-  int BYTECODE_JAVA_8 = 5;
+  int BYTECODE_JAVA_LE_4 = 48;
+  int BYTECODE_JAVA_5 = 49;
+  int BYTECODE_JAVA_6 = 50;
+  int BYTECODE_JAVA_7 = 51;
+  int BYTECODE_JAVA_8 = 52;
+  int BYTECODE_JAVA_9 = 53;
+  int BYTECODE_JAVA_10 = 54;
+  int BYTECODE_JAVA_11 = 55;
+  int BYTECODE_JAVA_12 = 56;
+  int BYTECODE_JAVA_13 = 57;
 
   // ----------------------------------------------------------------------
   // VARIABLE TYPES
@@ -63,20 +54,6 @@ public interface CodeConstants {
   int TYPE_FAMILY_DOUBLE = 5;
   int TYPE_FAMILY_OBJECT = 6;
 
-  // ----------------------------------------------------------------------
-  // MODULE CONSTANTS
-  // ----------------------------------------------------------------------
-
-  int STACKSIZE_SIMPLE = 1;
-  int STACKSIZE_DOUBLE = 2;
-
-  int VAR_LOCAL = 0;
-  int VAR_STACK = 1;
-
-  int VAR_WRITE = 0;
-  int VAR_READ = 1;
-
-
   // ----------------------------------------------------------------------
   // ACCESS FLAGS
   // ----------------------------------------------------------------------
@@ -97,6 +74,7 @@ public interface CodeConstants {
   int ACC_SYNTHETIC = 0x1000;
   int ACC_ANNOTATION = 0x2000;
   int ACC_ENUM = 0x4000;
+  int ACC_MANDATED = 0x8000;
 
   // ----------------------------------------------------------------------
   // CLASS FLAGS
@@ -105,17 +83,6 @@ public interface CodeConstants {
   int ACC_SUPER = 0x0020;
   int ACC_INTERFACE = 0x0200;
 
-
-  // ----------------------------------------------------------------------
-  // DEPENDENCY CONSTANTS
-  // ----------------------------------------------------------------------
-
-  int DEP_CONSTANT = 0;
-  int DEP_UNKNOWN = 1;
-  int DEP_GENERAL = 2;
-  int DEP_PARAMS = 4;
-  int DEP_STATIC = 8;
-
   // ----------------------------------------------------------------------
   // INSTRUCTION GROUPS
   // ----------------------------------------------------------------------
@@ -351,7 +318,6 @@ public interface CodeConstants {
   int opc_invokestatic = 184;
   int opc_invokeinterface = 185;
   int opc_invokedynamic = 186;
-  int opc_xxxunusedxxx = 186;
   int opc_new = 187;
   int opc_newarray = 188;
   int opc_anewarray = 189;
@@ -368,7 +334,6 @@ public interface CodeConstants {
   int opc_goto_w = 200;
   int opc_jsr_w = 201;
 
-  @SuppressWarnings("SpellCheckingInspection")
   String CLINIT_NAME = "<clinit>";
   String INIT_NAME = "<init>";
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/ConstantsUtil.java b/src/org/jetbrains/java/decompiler/code/ConstantsUtil.java
deleted file mode 100644
index b9a30a5..0000000
--- a/src/org/jetbrains/java/decompiler/code/ConstantsUtil.java
+++ /dev/null
@@ -1,482 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code;
-
-import org.jetbrains.java.decompiler.code.optinstructions.*;
-
-public class ConstantsUtil {
-
-  public static String getName(int opcode) {
-    return opcodeNames[opcode];
-  }
-
-  public static Instruction getInstructionInstance(int opcode, boolean wide, int group, int bytecode_version, int[] operands) {
-
-    Instruction instr = getInstructionInstance(opcode, bytecode_version);
-    instr.wide = wide;
-    instr.group = group;
-    instr.bytecode_version = bytecode_version;
-    instr.setOperands(operands);
-
-    return instr;
-  }
-
-  private static Instruction getInstructionInstance(int opcode, int bytecode_version) {
-    try {
-      Instruction instr;
-
-      if ((opcode >= CodeConstants.opc_ifeq &&
-           opcode <= CodeConstants.opc_if_acmpne) ||
-          opcode == CodeConstants.opc_ifnull ||
-          opcode == CodeConstants.opc_ifnonnull) {
-        instr = new IfInstruction();
-      }
-      else {
-
-        Class cl = opcodeClasses[opcode];
-
-        if (opcode == CodeConstants.opc_invokedynamic && bytecode_version < CodeConstants.BYTECODE_JAVA_7) {
-          cl = null; // instruction unused in Java 6 and before
-        }
-
-        if (cl == null) {
-          instr = new Instruction();
-        }
-        else {
-          instr = (Instruction)cl.newInstance();
-        }
-      }
-
-      instr.opcode = opcode;
-      return instr;
-    }
-    catch (Exception ex) {
-      return null;
-    }
-  }
-
-
-  private static final String[] opcodeNames = {
-    "nop",                                //    "nop",
-    "aconst_null",                //    "aconst_null",
-    "iconst_m1",                        //    "iconst_m1",
-    "iconst_0",                        //    "iconst_0",
-    "iconst_1",                        //    "iconst_1",
-    "iconst_2",                        //    "iconst_2",
-    "iconst_3",                        //    "iconst_3",
-    "iconst_4",                        //    "iconst_4",
-    "iconst_5",                        //    "iconst_5",
-    "lconst_0",                        //    "lconst_0",
-    "lconst_1",                        //    "lconst_1",
-    "fconst_0",                        //    "fconst_0",
-    "fconst_1",                        //    "fconst_1",
-    "fconst_2",                        //    "fconst_2",
-    "dconst_0",                        //    "dconst_0",
-    "dconst_1",                        //    "dconst_1",
-    "bipush",                        //    "bipush",
-    "sipush",                        //    "sipush",
-    "ldc",                        //    "ldc",
-    "ldc_w",                        //    "ldc_w",
-    "ldc2_w",                        //    "ldc2_w",
-    "iload",                        //    "iload",
-    "lload",                        //    "lload",
-    "fload",                        //    "fload",
-    "dload",                        //    "dload",
-    "aload",                        //    "aload",
-    "iload_0",                        //    "iload_0",
-    "iload_1",                        //    "iload_1",
-    "iload_2",                        //    "iload_2",
-    "iload_3",                        //    "iload_3",
-    "lload_0",                        //    "lload_0",
-    "lload_1",                        //    "lload_1",
-    "lload_2",                        //    "lload_2",
-    "lload_3",                        //    "lload_3",
-    "fload_0",                        //    "fload_0",
-    "fload_1",                        //    "fload_1",
-    "fload_2",                        //    "fload_2",
-    "fload_3",                        //    "fload_3",
-    "dload_0",                        //    "dload_0",
-    "dload_1",                        //    "dload_1",
-    "dload_2",                        //    "dload_2",
-    "dload_3",                        //    "dload_3",
-    "aload_0",                        //    "aload_0",
-    "aload_1",                        //    "aload_1",
-    "aload_2",                        //    "aload_2",
-    "aload_3",                        //    "aload_3",
-    "iaload",                        //    "iaload",
-    "laload",                        //    "laload",
-    "faload",                        //    "faload",
-    "daload",                        //    "daload",
-    "aaload",                        //    "aaload",
-    "baload",                        //    "baload",
-    "caload",                        //    "caload",
-    "saload",                        //    "saload",
-    "istore",                        //    "istore",
-    "lstore",                        //    "lstore",
-    "fstore",                        //    "fstore",
-    "dstore",                        //    "dstore",
-    "astore",                        //    "astore",
-    "istore_0",                        //    "istore_0",
-    "istore_1",                        //    "istore_1",
-    "istore_2",                        //    "istore_2",
-    "istore_3",                        //    "istore_3",
-    "lstore_0",                        //    "lstore_0",
-    "lstore_1",                        //    "lstore_1",
-    "lstore_2",                        //    "lstore_2",
-    "lstore_3",                        //    "lstore_3",
-    "fstore_0",                        //    "fstore_0",
-    "fstore_1",                        //    "fstore_1",
-    "fstore_2",                        //    "fstore_2",
-    "fstore_3",                        //    "fstore_3",
-    "dstore_0",                        //    "dstore_0",
-    "dstore_1",                        //    "dstore_1",
-    "dstore_2",                        //    "dstore_2",
-    "dstore_3",                        //    "dstore_3",
-    "astore_0",                        //    "astore_0",
-    "astore_1",                        //    "astore_1",
-    "astore_2",                        //    "astore_2",
-    "astore_3",                        //    "astore_3",
-    "iastore",                        //    "iastore",
-    "lastore",                        //    "lastore",
-    "fastore",                        //    "fastore",
-    "dastore",                        //    "dastore",
-    "aastore",                        //    "aastore",
-    "bastore",                        //    "bastore",
-    "castore",                        //    "castore",
-    "sastore",                        //    "sastore",
-    "pop",                        //    "pop",
-    "pop2",                        //    "pop2",
-    "dup",                        //    "dup",
-    "dup_x1",                        //    "dup_x1",
-    "dup_x2",                        //    "dup_x2",
-    "dup2",                        //    "dup2",
-    "dup2_x1",                        //    "dup2_x1",
-    "dup2_x2",                        //    "dup2_x2",
-    "swap",                        //    "swap",
-    "iadd",                        //    "iadd",
-    "ladd",                        //    "ladd",
-    "fadd",                        //    "fadd",
-    "dadd",                        //    "dadd",
-    "isub",                        //    "isub",
-    "lsub",                        //    "lsub",
-    "fsub",                        //    "fsub",
-    "dsub",                        //    "dsub",
-    "imul",                        //    "imul",
-    "lmul",                        //    "lmul",
-    "fmul",                        //    "fmul",
-    "dmul",                        //    "dmul",
-    "idiv",                        //    "idiv",
-    "ldiv",                        //    "ldiv",
-    "fdiv",                        //    "fdiv",
-    "ddiv",                        //    "ddiv",
-    "irem",                        //    "irem",
-    "lrem",                        //    "lrem",
-    "frem",                        //    "frem",
-    "drem",                        //    "drem",
-    "ineg",                        //    "ineg",
-    "lneg",                        //    "lneg",
-    "fneg",                        //    "fneg",
-    "dneg",                        //    "dneg",
-    "ishl",                        //    "ishl",
-    "lshl",                        //    "lshl",
-    "ishr",                        //    "ishr",
-    "lshr",                        //    "lshr",
-    "iushr",                        //    "iushr",
-    "lushr",                        //    "lushr",
-    "iand",                        //    "iand",
-    "land",                        //    "land",
-    "ior",                        //    "ior",
-    "lor",                        //    "lor",
-    "ixor",                        //    "ixor",
-    "lxor",                        //    "lxor",
-    "iinc",                        //    "iinc",
-    "i2l",                        //    "i2l",
-    "i2f",                        //    "i2f",
-    "i2d",                        //    "i2d",
-    "l2i",                        //    "l2i",
-    "l2f",                        //    "l2f",
-    "l2d",                        //    "l2d",
-    "f2i",                        //    "f2i",
-    "f2l",                        //    "f2l",
-    "f2d",                        //    "f2d",
-    "d2i",                        //    "d2i",
-    "d2l",                        //    "d2l",
-    "d2f",                        //    "d2f",
-    "i2b",                        //    "i2b",
-    "i2c",                        //    "i2c",
-    "i2s",                        //    "i2s",
-    "lcmp",                        //    "lcmp",
-    "fcmpl",                        //    "fcmpl",
-    "fcmpg",                        //    "fcmpg",
-    "dcmpl",                        //    "dcmpl",
-    "dcmpg",                        //    "dcmpg",
-    "ifeq",                        //    "ifeq",
-    "ifne",                        //    "ifne",
-    "iflt",                        //    "iflt",
-    "ifge",                        //    "ifge",
-    "ifgt",                        //    "ifgt",
-    "ifle",                        //    "ifle",
-    "if_icmpeq",                //    "if_icmpeq",
-    "if_icmpne",                //    "if_icmpne",
-    "if_icmplt",                //    "if_icmplt",
-    "if_icmpge",                //    "if_icmpge",
-    "if_icmpgt",                //    "if_icmpgt",
-    "if_icmple",                //    "if_icmple",
-    "if_acmpeq",                //    "if_acmpeq",
-    "if_acmpne",                //    "if_acmpne",
-    "goto",                        //    "goto",
-    "jsr",                        //    "jsr",
-    "ret",                        //    "ret",
-    "tableswitch",                        //    "tableswitch",
-    "lookupswitch",                        //    "lookupswitch",
-    "ireturn",                        //    "ireturn",
-    "lreturn",                        //    "lreturn",
-    "freturn",                        //    "freturn",
-    "dreturn",                        //    "dreturn",
-    "areturn",                        //    "areturn",
-    "return",                        //    "return",
-    "getstatic",                //    "getstatic",
-    "putstatic",                //    "putstatic",
-    "getfield",                //    "getfield",
-    "putfield",                //    "putfield",
-    "invokevirtual",                //    "invokevirtual",
-    "invokespecial",                //    "invokespecial",
-    "invokestatic",                //    "invokestatic",
-    "invokeinterface",                //    "invokeinterface",
-    //"xxxunusedxxx",		//    "xxxunusedxxx", Java 6 and before
-    "invokedynamic",                //    "invokedynamic", Java 7 and later
-    "new",                                //    "new",
-    "newarray",                //    "newarray",
-    "anewarray",                //    "anewarray",
-    "arraylength",                //    "arraylength",
-    "athrow",                        //    "athrow",
-    "checkcast",                //    "checkcast",
-    "instanceof",                //    "instanceof",
-    "monitorenter",                //    "monitorenter",
-    "monitorexit",                //    "monitorexit",
-    "wide",                        //    "wide",
-    "multianewarray",                //    "multianewarray",
-    "ifnull",                        //    "ifnull",
-    "ifnonnull",                //    "ifnonnull",
-    "goto_w",                        //    "goto_w",
-    "jsr_w"                        //    "jsr_w"
-  };
-
-  private static final Class[] opcodeClasses = {
-    null,                                //    "nop",
-    null,                        //    "aconst_null",
-    null,                        //    "iconst_m1",
-    null,                        //    "iconst_0",
-    null,                        //    "iconst_1",
-    null,                        //    "iconst_2",
-    null,                        //    "iconst_3",
-    null,                        //    "iconst_4",
-    null,                        //    "iconst_5",
-    null,                        //    "lconst_0",
-    null,                        //    "lconst_1",
-    null,                                //    "fconst_0",
-    null,                                //    "fconst_1",
-    null,                                //    "fconst_2",
-    null,                                //    "dconst_0",
-    null,                                //    "dconst_1",
-    BIPUSH.class,                        //    "bipush",
-    SIPUSH.class,                        //    "sipush",
-    LDC.class,                        //    "ldc",
-    LDC_W.class,                        //    "ldc_w",
-    LDC2_W.class,                        //    "ldc2_w",
-    ILOAD.class,                        //    "iload",
-    LLOAD.class,                        //    "lload",
-    FLOAD.class,                        //    "fload",
-    DLOAD.class,                        //    "dload",
-    ALOAD.class,                        //    "aload",
-    null,                        //    "iload_0",
-    null,                        //    "iload_1",
-    null,                        //    "iload_2",
-    null,                        //    "iload_3",
-    null,                        //    "lload_0",
-    null,                        //    "lload_1",
-    null,                        //    "lload_2",
-    null,                        //    "lload_3",
-    null,                        //    "fload_0",
-    null,                        //    "fload_1",
-    null,                        //    "fload_2",
-    null,                        //    "fload_3",
-    null,                        //    "dload_0",
-    null,                        //    "dload_1",
-    null,                        //    "dload_2",
-    null,                        //    "dload_3",
-    null,                        //    "aload_0",
-    null,                        //    "aload_1",
-    null,                        //    "aload_2",
-    null,                        //    "aload_3",
-    null,                        //    "iaload",
-    null,                        //    "laload",
-    null,                                //    "faload",
-    null,                                //    "daload",
-    null,                                //    "aaload",
-    null,                                //    "baload",
-    null,                                //    "caload",
-    null,                                //    "saload",
-    ISTORE.class,                        //    "istore",
-    LSTORE.class,                        //    "lstore",
-    FSTORE.class,                        //    "fstore",
-    DSTORE.class,                        //    "dstore",
-    ASTORE.class,                        //    "astore",
-    null,                        //    "istore_0",
-    null,                        //    "istore_1",
-    null,                        //    "istore_2",
-    null,                        //    "istore_3",
-    null,                        //    "lstore_0",
-    null,                        //    "lstore_1",
-    null,                        //    "lstore_2",
-    null,                        //    "lstore_3",
-    null,                        //    "fstore_0",
-    null,                        //    "fstore_1",
-    null,                        //    "fstore_2",
-    null,                        //    "fstore_3",
-    null,                        //    "dstore_0",
-    null,                        //    "dstore_1",
-    null,                        //    "dstore_2",
-    null,                        //    "dstore_3",
-    null,                        //    "astore_0",
-    null,                        //    "astore_1",
-    null,                        //    "astore_2",
-    null,                        //    "astore_3",
-    null,                        //    "iastore",
-    null,                        //    "lastore",
-    null,                                //    "fastore",
-    null,                                //    "dastore",
-    null,                                //    "aastore",
-    null,                                //    "bastore",
-    null,                                //    "castore",
-    null,                        //    "sastore",
-    null,                        //    "pop",
-    null,                        //    "pop2",
-    null,                        //    "dup",
-    null,                        //    "dup_x1",
-    null,                        //    "dup_x2",
-    null,                        //    "dup2",
-    null,                        //    "dup2_x1",
-    null,                        //    "dup2_x2",
-    null,                        //    "swap",
-    null,                        //    "iadd",
-    null,                        //    "ladd",
-    null,                        //    "fadd",
-    null,                        //    "dadd",
-    null,                        //    "isub",
-    null,                        //    "lsub",
-    null,                        //    "fsub",
-    null,                        //    "dsub",
-    null,                        //    "imul",
-    null,                        //    "lmul",
-    null,                        //    "fmul",
-    null,                        //    "dmul",
-    null,                        //    "idiv",
-    null,                        //    "ldiv",
-    null,                        //    "fdiv",
-    null,                        //    "ddiv",
-    null,                        //    "irem",
-    null,                        //    "lrem",
-    null,                        //    "frem",
-    null,                        //    "drem",
-    null,                        //    "ineg",
-    null,                        //    "lneg",
-    null,                        //    "fneg",
-    null,                        //    "dneg",
-    null,                        //    "ishl",
-    null,                        //    "lshl",
-    null,                        //    "ishr",
-    null,                        //    "lshr",
-    null,                        //    "iushr",
-    null,                        //    "lushr",
-    null,                        //    "iand",
-    null,                        //    "land",
-    null,                        //    "ior",
-    null,                        //    "lor",
-    null,                        //    "ixor",
-    null,                        //    "lxor",
-    IINC.class,                        //    "iinc",
-    null,                        //    "i2l",
-    null,                        //    "i2f",
-    null,                        //    "i2d",
-    null,                        //    "l2i",
-    null,                        //    "l2f",
-    null,                        //    "l2d",
-    null,                        //    "f2i",
-    null,                        //    "f2l",
-    null,                        //    "f2d",
-    null,                        //    "d2i",
-    null,                        //    "d2l",
-    null,                        //    "d2f",
-    null,                        //    "i2b",
-    null,                        //    "i2c",
-    null,                        //    "i2s",
-    null,                        //    "lcmp",
-    null,                        //    "fcmpl",
-    null,                        //    "fcmpg",
-    null,                        //    "dcmpl",
-    null,                        //    "dcmpg",
-    null,                        //    "ifeq",
-    null,                        //    "ifne",
-    null,                        //    "iflt",
-    null,                        //    "ifge",
-    null,                        //    "ifgt",
-    null,                        //    "ifle",
-    null,                //    "if_icmpeq",
-    null,                //    "if_icmpne",
-    null,                //    "if_icmplt",
-    null,                //    "if_icmpge",
-    null,                //    "if_icmpgt",
-    null,                //    "if_icmple",
-    null,                //    "if_acmpeq",
-    null,                //    "if_acmpne",
-    GOTO.class,                        //    "goto",
-    JSR.class,                        //    "jsr",
-    RET.class,                        //    "ret",
-    TABLESWITCH.class,                        //    "tableswitch",
-    LOOKUPSWITCH.class,                        //    "lookupswitch",
-    null,                        //    "ireturn",
-    null,                        //    "lreturn",
-    null,                                //    "freturn",
-    null,                                //    "dreturn",
-    null,                                //    "areturn",
-    null,                                //    "return",
-    GETSTATIC.class,                //    "getstatic",
-    PUTSTATIC.class,                //    "putstatic",
-    GETFIELD.class,                //    "getfield",
-    PUTFIELD.class,                //    "putfield",
-    INVOKEVIRTUAL.class,                //    "invokevirtual",
-    INVOKESPECIAL.class,                //    "invokespecial",
-    INVOKESTATIC.class,                //    "invokestatic",
-    INVOKEINTERFACE.class,                //    "invokeinterface",
-    INVOKEDYNAMIC.class,                //    "xxxunusedxxx" Java 6 and before, "invokedynamic" Java 7 and later
-    NEW.class,                                //    "new",
-    NEWARRAY.class,                //    "newarray",
-    ANEWARRAY.class,                //    "anewarray",
-    null,                                //    "arraylength",
-    null,                                //    "athrow",
-    CHECKCAST.class,                //    "checkcast",
-    INSTANCEOF.class,                //    "instanceof",
-    null,                                //    "monitorenter",
-    null,                                //    "monitorexit",
-    null,                                //    "wide",
-    MULTIANEWARRAY.class,                //    "multianewarray",
-    null,                        //    "ifnull",
-    null,                //    "ifnonnull",
-    GOTO_W.class,                        //    "goto_w",
-    JSR_W.class                                //    "jsr_w"
-  };
-}
diff --git a/src/org/jetbrains/java/decompiler/code/ExceptionHandler.java b/src/org/jetbrains/java/decompiler/code/ExceptionHandler.java
index 2927294..0d20726 100644
--- a/src/org/jetbrains/java/decompiler/code/ExceptionHandler.java
+++ b/src/org/jetbrains/java/decompiler/code/ExceptionHandler.java
@@ -1,27 +1,9 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 
-import java.io.DataOutputStream;
-import java.io.IOException;
-
 public class ExceptionHandler {
-
   public int from = 0;
   public int to = 0;
   public int handler = 0;
@@ -30,32 +12,12 @@ public class ExceptionHandler {
   public int to_instr = 0;
   public int handler_instr = 0;
 
-  public int class_index = 0;
   public String exceptionClass = null;
 
-  public ExceptionHandler() {
-  }
-
-  public ExceptionHandler(int from_raw, int to_raw, int handler_raw, String exceptionClass) {
-    this.from = from_raw;
-    this.to = to_raw;
-    this.handler = handler_raw;
-    this.exceptionClass = exceptionClass;
-  }
-
-  public void writeToStream(DataOutputStream out) throws IOException {
-    out.writeShort(from);
-    out.writeShort(to);
-    out.writeShort(handler);
-    out.writeShort(class_index);
-  }
-
   public String toString() {
-
     String new_line_separator = DecompilerContext.getNewLineSeparator();
-
     return "from: " + from + " to: " + to + " handler: " + handler + new_line_separator +
            "from_instr: " + from_instr + " to_instr: " + to_instr + " handler_instr: " + handler_instr + new_line_separator +
            "exceptionClass: " + exceptionClass + new_line_separator;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/ExceptionTable.java b/src/org/jetbrains/java/decompiler/code/ExceptionTable.java
index 533fa55..7416623 100644
--- a/src/org/jetbrains/java/decompiler/code/ExceptionTable.java
+++ b/src/org/jetbrains/java/decompiler/code/ExceptionTable.java
@@ -1,33 +1,11 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
-import org.jetbrains.java.decompiler.code.interpreter.Util;
-import org.jetbrains.java.decompiler.struct.StructContext;
-
 import java.util.Collections;
 import java.util.List;
 
 public class ExceptionTable {
-  public static final ExceptionTable EMPTY = new ExceptionTable(null) {
-    @Override
-    public List<ExceptionHandler> getHandlers() {
-      return Collections.emptyList();
-    }
-  };
+  public static final ExceptionTable EMPTY = new ExceptionTable(Collections.emptyList());
 
   private final List<ExceptionHandler> handlers;
 
@@ -35,27 +13,7 @@ public class ExceptionTable {
     this.handlers = handlers;
   }
 
-
-  public ExceptionHandler getHandlerByClass(StructContext context, int line, String valclass, boolean withany) {
-
-    ExceptionHandler res = null; // no handler found
-
-    for (ExceptionHandler handler : handlers) {
-      if (handler.from <= line && handler.to > line) {
-        String name = handler.exceptionClass;
-
-        if ((withany && name == null) ||   // any -> finally or synchronized handler
-            (name != null && Util.instanceOf(context, valclass, name))) {
-          res = handler;
-          break;
-        }
-      }
-    }
-
-    return res;
-  }
-
   public List<ExceptionHandler> getHandlers() {
     return handlers;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/FullInstructionSequence.java b/src/org/jetbrains/java/decompiler/code/FullInstructionSequence.java
index ae5d4f2..b568a24 100644
--- a/src/org/jetbrains/java/decompiler/code/FullInstructionSequence.java
+++ b/src/org/jetbrains/java/decompiler/code/FullInstructionSequence.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
 import org.jetbrains.java.decompiler.util.VBStyleCollection;
diff --git a/src/org/jetbrains/java/decompiler/code/IfInstruction.java b/src/org/jetbrains/java/decompiler/code/IfInstruction.java
deleted file mode 100644
index 1d4bf6c..0000000
--- a/src/org/jetbrains/java/decompiler/code/IfInstruction.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-/*
- * opc_ifeq, opc_ifne, opc_iflt, opc_ifge, opc_ifgt, opc_ifle, opc_if_icmpeq, opc_if_icmpne, opc_if_icmplt,
- * opc_if_icmpge, opc_if_icmpgt, opc_if_icmple, opc_if_acmpeq, opc_if_acmpne, opc_ifnull, opc_ifnonnull
- */
-
-public class IfInstruction extends JumpInstruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opcode);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/Instruction.java b/src/org/jetbrains/java/decompiler/code/Instruction.java
index d77f3b4..1a260f2 100644
--- a/src/org/jetbrains/java/decompiler/code/Instruction.java
+++ b/src/org/jetbrains/java/decompiler/code/Instruction.java
@@ -1,126 +1,87 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
-import java.io.DataOutputStream;
-import java.io.IOException;
+import org.jetbrains.java.decompiler.util.TextUtil;
 
 public class Instruction implements CodeConstants {
-
-  // *****************************************************************************
-  // public fields
-  // *****************************************************************************
-
-  public int opcode;
-
-  public int group = CodeConstants.GROUP_GENERAL;
-
-  public boolean wide = false;
-
-  public int bytecode_version = BYTECODE_JAVA_LE_4;
-
-  // *****************************************************************************
-  // private fields
-  // *****************************************************************************
-
-  private int[] operands = null;
-
-  // *****************************************************************************
-  // public methods
-  // *****************************************************************************
-
-  public Instruction() {
+  public static Instruction create(int opcode, boolean wide, int group, int bytecodeVersion, int[] operands) {
+    if (opcode >= opc_ifeq && opcode <= opc_if_acmpne ||
+        opcode == opc_ifnull || opcode == opc_ifnonnull ||
+        opcode == opc_jsr || opcode == opc_jsr_w ||
+        opcode == opc_goto || opcode == opc_goto_w) {
+      return new JumpInstruction(opcode, group, wide, bytecodeVersion, operands);
+    }
+    else if (opcode == opc_tableswitch || opcode == opc_lookupswitch) {
+      return new SwitchInstruction(opcode, group, wide, bytecodeVersion, operands);
+    }
+    else {
+      return new Instruction(opcode, group, wide, bytecodeVersion, operands);
+    }
   }
 
-  public int length() {
-    return 1;
+  public static boolean equals(Instruction i1, Instruction i2) {
+    return i1 != null && i2 != null &&
+           (i1 == i2 ||
+            i1.opcode == i2.opcode &&
+            i1.wide == i2.wide &&
+            i1.operandsCount() == i2.operandsCount());
   }
 
+  public final int opcode;
+  public final int group;
+  public final boolean wide;
+  public final int bytecodeVersion;
+
+  protected final int[] operands;
+
+  public Instruction(int opcode, int group, boolean wide, int bytecodeVersion, int[] operands) {
+    this.opcode = opcode;
+    this.group = group;
+    this.wide = wide;
+    this.bytecodeVersion = bytecodeVersion;
+    this.operands = operands;
+  }
+
+  public void initInstruction(InstructionSequence seq) { }
+
   public int operandsCount() {
-    return (operands == null) ? 0 : operands.length;
+    return operands == null ? 0 : operands.length;
   }
 
-  public int getOperand(int index) {
+  public int operand(int index) {
     return operands[index];
   }
 
-  public Instruction clone() {
-    return ConstantsUtil.getInstructionInstance(opcode, wide, group, bytecode_version, operands == null ? null : operands.clone());
+  public boolean canFallThrough() {
+    return opcode != opc_goto && opcode != opc_goto_w && opcode != opc_ret &&
+           !(opcode >= opc_ireturn && opcode <= opc_return) &&
+           opcode != opc_athrow &&
+           opcode != opc_jsr && opcode != opc_tableswitch && opcode != opc_lookupswitch;
   }
 
+  @Override
   public String toString() {
-
-    String res = wide ? "@wide " : "";
-    res += "@" + ConstantsUtil.getName(opcode);
+    StringBuilder res = new StringBuilder();
+    if (wide) res.append("@wide ");
+    res.append("@").append(TextUtil.getInstructionName(opcode));
 
     int len = operandsCount();
     for (int i = 0; i < len; i++) {
       int op = operands[i];
       if (op < 0) {
-        res += " -" + Integer.toHexString(-op);
+        res.append(" -").append(Integer.toHexString(-op));
       }
       else {
-        res += " " + Integer.toHexString(op);
+        res.append(" ").append(Integer.toHexString(op));
       }
     }
 
-    return res;
+    return res.toString();
   }
 
-  public boolean canFallthrough() {
-    return opcode != opc_goto && opcode != opc_goto_w && opcode != opc_ret &&
-           !(opcode >= opc_ireturn && opcode <= opc_return) && opcode != opc_athrow
-           && opcode != opc_jsr && opcode != opc_tableswitch && opcode != opc_lookupswitch;
+  @Override
+  @SuppressWarnings("MethodDoesntCallSuperMethod")
+  public Instruction clone() {
+    return create(opcode, wide, group, bytecodeVersion, operands == null ? null : operands.clone());
   }
-
-  public boolean equalsInstruction(Instruction instr) {
-    if (opcode != instr.opcode || wide != instr.wide
-        || operandsCount() != instr.operandsCount()) {
-      return false;
-    }
-
-    if (operands != null) {
-      for (int i = 0; i < operands.length; i++) {
-        if (operands[i] != instr.getOperand(i)) {
-          return false;
-        }
-      }
-    }
-
-    return true;
-  }
-
-  // should be overwritten by subclasses
-  public void initInstruction(InstructionSequence seq) {
-  }
-
-  // should be overwritten by subclasses
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opcode);
-  }
-
-  // *****************************************************************************
-  // getter and setter methods
-  // *****************************************************************************
-
-  public int[] getOperands() {
-    return operands;
-  }
-
-  public void setOperands(int[] operands) {
-    this.operands = operands;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/InstructionSequence.java b/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
index 51951ab..3d0cab0 100644
--- a/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
+++ b/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
@@ -1,33 +1,10 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
-import org.jetbrains.java.decompiler.code.interpreter.Util;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.struct.StructContext;
-import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextUtil;
 import org.jetbrains.java.decompiler.util.VBStyleCollection;
 
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-
 public abstract class InstructionSequence {
 
   // *****************************************************************************
@@ -41,7 +18,7 @@ public abstract class InstructionSequence {
   protected ExceptionTable exceptionTable = ExceptionTable.EMPTY;
 
   protected InstructionSequence() {
-    this(new VBStyleCollection<Instruction, Integer>());
+    this(new VBStyleCollection<>());
   }
 
   protected InstructionSequence(VBStyleCollection<Instruction, Integer> collinstr) {
@@ -53,6 +30,7 @@ public abstract class InstructionSequence {
   // *****************************************************************************
 
   // to nbe overwritten
+  @Override
   public InstructionSequence clone() {
     return null;
   }
@@ -87,10 +65,6 @@ public abstract class InstructionSequence {
     }
   }
 
-  public Instruction getCurrentInstr() {
-    return collinstr.get(pointer);
-  }
-
   public Instruction getInstr(int index) {
   return collinstr.get(index);
   }
@@ -99,16 +73,12 @@ public abstract class InstructionSequence {
   return collinstr.getLast();
   }
 
-  public int getCurrentOffset() {
-    return collinstr.getKey(pointer).intValue();
-  }
-
-public int getOffset(int index) {
-    return collinstr.getKey(index).intValue();
+  public int getOffset(int index) {
+    return collinstr.getKey(index);
   }
 
   public int getPointerByAbsOffset(int offset) {
-    Integer absoffset = new Integer(offset);
+    Integer absoffset = offset;
     if (collinstr.containsKey(absoffset)) {
       return collinstr.getIndexByKey(absoffset);
     }
@@ -118,7 +88,7 @@ public int getOffset(int index) {
   }
 
   public int getPointerByRelOffset(int offset) {
-    Integer absoffset = new Integer(collinstr.getKey(pointer).intValue() + offset);
+    Integer absoffset = collinstr.getKey(pointer) + offset;
     if (collinstr.containsKey(absoffset)) {
       return collinstr.getIndexByKey(absoffset);
     }
@@ -127,13 +97,6 @@ public int getOffset(int index) {
     }
   }
 
-  public void setPointerByAbsOffset(int offset) {
-    Integer absoffset = new Integer(collinstr.getKey(pointer).intValue() + offset);
-    if (collinstr.containsKey(absoffset)) {
-      pointer = collinstr.getIndexByKey(absoffset);
-    }
-  }
-
   public int length() {
     return collinstr.size();
   }
@@ -157,7 +120,7 @@ public int getOffset(int index) {
     StringBuilder buf = new StringBuilder();
 
     for (int i = 0; i < collinstr.size(); i++) {
-    buf.append(InterpreterUtil.getIndentString(indent));
+    buf.append(TextUtil.getIndentString(indent));
       buf.append(collinstr.getKey(i).intValue());
       buf.append(": ");
       buf.append(collinstr.get(i).toString());
@@ -167,58 +130,6 @@ public int getOffset(int index) {
     return buf.toString();
   }
 
-  public void writeCodeToStream(DataOutputStream out) throws IOException {
-
-    for (int i = 0; i < collinstr.size(); i++) {
-      collinstr.get(i).writeToStream(out, collinstr.getKey(i).intValue());
-    }
-  }
-
-  public void writeExceptionsToStream(DataOutputStream out) throws IOException {
-
-    List<ExceptionHandler> handlers = exceptionTable.getHandlers();
-
-    out.writeShort(handlers.size());
-    for (int i = 0; i < handlers.size(); i++) {
-      handlers.get(i).writeToStream(out);
-    }
-  }
-
-  public void sortHandlers(final StructContext context) {
-
-    Collections.sort(exceptionTable.getHandlers(), new Comparator<ExceptionHandler>() {
-
-      public int compare(ExceptionHandler handler0, ExceptionHandler handler1) {
-
-        if (handler0.to == handler1.to) {
-          if (handler0.exceptionClass == null) {
-            return 1;
-          }
-          else {
-            if (handler1.exceptionClass == null) {
-              return -1;
-            }
-            else if (handler0.exceptionClass.equals(handler1.exceptionClass)) {
-              return (handler0.from > handler1.from) ? -1 : 1; // invalid code
-            }
-            else {
-              if (Util.instanceOf(context, handler0.exceptionClass, handler1.exceptionClass)) {
-                return -1;
-              }
-              else {
-                return 1;
-              }
-            }
-          }
-        }
-        else {
-          return (handler0.to > handler1.to) ? 1 : -1;
-        }
-      }
-    });
-  }
-
-
   // *****************************************************************************
   // getter and setter methods
   // *****************************************************************************
@@ -234,8 +145,4 @@ public int getOffset(int index) {
   public ExceptionTable getExceptionTable() {
     return exceptionTable;
   }
-
-  public void setExceptionTable(ExceptionTable exceptionTable) {
-    this.exceptionTable = exceptionTable;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/JumpInstruction.java b/src/org/jetbrains/java/decompiler/code/JumpInstruction.java
index 44f4ff9..129df62 100644
--- a/src/org/jetbrains/java/decompiler/code/JumpInstruction.java
+++ b/src/org/jetbrains/java/decompiler/code/JumpInstruction.java
@@ -1,42 +1,22 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
-/*
- * opc_ifeq, opc_ifne, opc_iflt, opc_ifge, opc_ifgt, opc_ifle, opc_if_icmpeq, opc_if_icmpne, opc_if_icmplt,
- * opc_if_icmpge, opc_if_icmpgt, opc_if_icmple, opc_if_acmpeq, opc_if_acmpne, opc_ifnull, opc_ifnonnull
- * opc_goto, opc_jsr, opc_goto_w, opc_jsr_w
- */
-
-
 public class JumpInstruction extends Instruction {
-
   public int destination;
 
-  public JumpInstruction() {
+  public JumpInstruction(int opcode, int group, boolean wide, int bytecodeVersion, int[] operands) {
+    super(opcode, group, wide, bytecodeVersion, operands);
   }
 
+  @Override
   public void initInstruction(InstructionSequence seq) {
-    destination = seq.getPointerByRelOffset(this.getOperand(0));
+    destination = seq.getPointerByRelOffset(this.operand(0));
   }
 
+  @Override
   public JumpInstruction clone() {
-    JumpInstruction newinstr = (JumpInstruction)super.clone();
-
-    newinstr.destination = destination;
-    return newinstr;
+    JumpInstruction copy = (JumpInstruction)super.clone();
+    copy.destination = destination;
+    return copy;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java b/src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java
index 5963509..0b62c51 100644
--- a/src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java
+++ b/src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
 import org.jetbrains.java.decompiler.util.VBStyleCollection;
@@ -26,14 +12,11 @@ public class SimpleInstructionSequence extends InstructionSequence {
     super(collinstr);
   }
 
+  @Override
   public SimpleInstructionSequence clone() {
     SimpleInstructionSequence newseq = new SimpleInstructionSequence(collinstr.clone());
     newseq.setPointer(this.getPointer());
 
     return newseq;
   }
-
-  public void removeInstruction(int index) {
-    collinstr.remove(index);
-  }
 }
diff --git a/src/org/jetbrains/java/decompiler/code/SwitchInstruction.java b/src/org/jetbrains/java/decompiler/code/SwitchInstruction.java
index 6aa6a7f..61810d9 100644
--- a/src/org/jetbrains/java/decompiler/code/SwitchInstruction.java
+++ b/src/org/jetbrains/java/decompiler/code/SwitchInstruction.java
@@ -1,97 +1,61 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code;
 
-/*
- *   opc_tableswitch, lookupswitch
- */
-
 public class SwitchInstruction extends Instruction {
-
   private int[] destinations;
-
   private int[] values;
+  private int defaultDestination;
 
-  private int defaultdest;
-
-  public SwitchInstruction() {
+  public SwitchInstruction(int opcode, int group, boolean wide, int bytecodeVersion, int[] operands) {
+    super(opcode, group, wide, bytecodeVersion, operands);
   }
 
-
+  @Override
   public void initInstruction(InstructionSequence seq) {
+    defaultDestination = seq.getPointerByRelOffset(operands[0]);
 
-    int pref = (opcode == CodeConstants.opc_tableswitch ? 3 : 2);
-    int len = this.getOperands().length - pref;
-    defaultdest = seq.getPointerByRelOffset(this.getOperand(0));
-
+    int prefix = opcode == CodeConstants.opc_tableswitch ? 3 : 2;
+    int len = operands.length - prefix;
     int low = 0;
-
     if (opcode == CodeConstants.opc_lookupswitch) {
       len /= 2;
     }
     else {
-      low = this.getOperand(1);
+      low = operands[1];
     }
 
     destinations = new int[len];
     values = new int[len];
-
     for (int i = 0, k = 0; i < len; i++, k++) {
       if (opcode == CodeConstants.opc_lookupswitch) {
-        values[i] = this.getOperand(pref + k);
+        values[i] = operands[prefix + k];
         k++;
       }
       else {
         values[i] = low + k;
       }
-      destinations[i] = seq.getPointerByRelOffset(this.getOperand(pref + k));
+      destinations[i] = seq.getPointerByRelOffset(operands[prefix + k]);
     }
   }
 
-  public SwitchInstruction clone() {
-    SwitchInstruction newinstr = (SwitchInstruction)super.clone();
-
-    newinstr.defaultdest = defaultdest;
-    newinstr.destinations = destinations.clone();
-    newinstr.values = values.clone();
-
-    return newinstr;
-  }
-
   public int[] getDestinations() {
     return destinations;
   }
 
-  public void setDestinations(int[] destinations) {
-    this.destinations = destinations;
-  }
-
-  public int getDefaultdest() {
-    return defaultdest;
-  }
-
-  public void setDefaultdest(int defaultdest) {
-    this.defaultdest = defaultdest;
-  }
-
   public int[] getValues() {
     return values;
   }
 
-  public void setValues(int[] values) {
-    this.values = values;
+  public int getDefaultDestination() {
+    return defaultDestination;
   }
-}
+
+  @Override
+  public SwitchInstruction clone() {
+    SwitchInstruction copy = (SwitchInstruction)super.clone();
+    copy.defaultDestination = defaultDestination;
+    copy.destinations = destinations.clone();
+    copy.values = values.clone();
+    return copy;
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
index 2e29529..265ffca 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.cfg;
 
 import org.jetbrains.java.decompiler.code.Instruction;
@@ -30,8 +16,7 @@ public class BasicBlock implements IGraphNode {
   // public fields
   // *****************************************************************************
 
-  public int id = 0;
-
+  public int id;
   public int mark = 0;
 
   // *****************************************************************************
@@ -40,15 +25,11 @@ public class BasicBlock implements IGraphNode {
 
   private InstructionSequence seq = new SimpleInstructionSequence();
 
-  private List<BasicBlock> preds = new ArrayList<BasicBlock>();
-
-  private List<BasicBlock> succs = new ArrayList<BasicBlock>();
-
-  private final List<Integer> instrOldOffsets = new ArrayList<Integer>();
-
-  private List<BasicBlock> predExceptions = new ArrayList<BasicBlock>();
-
-  private List<BasicBlock> succExceptions = new ArrayList<BasicBlock>();
+  private final List<BasicBlock> preds = new ArrayList<>();
+  private final List<BasicBlock> succs = new ArrayList<>();
+  private final List<Integer> instrOldOffsets = new ArrayList<>();
+  private final List<BasicBlock> predExceptions = new ArrayList<>();
+  private final List<BasicBlock> succExceptions = new ArrayList<>();
 
   public BasicBlock(int id) {
     this.id = id;
@@ -58,7 +39,9 @@ public class BasicBlock implements IGraphNode {
   // public methods
   // *****************************************************************************
 
-  public Object clone() {
+  @Override
+  @SuppressWarnings("MethodDoesntCallSuperMethod")
+  public BasicBlock clone() {
     BasicBlock block = new BasicBlock(id);
 
     block.setSeq(seq.clone());
@@ -67,14 +50,6 @@ public class BasicBlock implements IGraphNode {
     return block;
   }
 
-  public void free() {
-    preds.clear();
-    succs.clear();
-    instrOldOffsets.clear();
-    succExceptions.clear();
-    seq = new SimpleInstructionSequence();
-  }
-
   public Instruction getInstruction(int index) {
     return seq.getInstr(index);
   }
@@ -105,7 +80,7 @@ public class BasicBlock implements IGraphNode {
   }
 
   public void removePredecessor(BasicBlock block) {
-    while (preds.remove(block)) ;
+    while (preds.remove(block)) /**/;
   }
 
   public void addSuccessor(BasicBlock block) {
@@ -114,11 +89,11 @@ public class BasicBlock implements IGraphNode {
   }
 
   public void removeSuccessor(BasicBlock block) {
-    while (succs.remove(block)) ;
+    while (succs.remove(block)) /**/;
     block.removePredecessor(this);
   }
 
-  // FIXME: unify block comparisons: id or direkt equality
+  // FIXME: unify block comparisons: id or direct equality
   public void replaceSuccessor(BasicBlock oldBlock, BasicBlock newBlock) {
     for (int i = 0; i < succs.size(); i++) {
       if (succs.get(i).id == oldBlock.id) {
@@ -142,7 +117,7 @@ public class BasicBlock implements IGraphNode {
   }
 
   public void removePredecessorException(BasicBlock block) {
-    while (predExceptions.remove(block)) ;
+    while (predExceptions.remove(block)) /**/;
   }
 
   public void addSuccessorException(BasicBlock block) {
@@ -153,7 +128,7 @@ public class BasicBlock implements IGraphNode {
   }
 
   public void removeSuccessorException(BasicBlock block) {
-    while (succExceptions.remove(block)) ;
+    while (succExceptions.remove(block)) /**/;
     block.removePredecessorException(this);
   }
 
@@ -168,27 +143,6 @@ public class BasicBlock implements IGraphNode {
     return id + ":" + new_line_separator + seq.toString(indent);
   }
 
-  public String toStringOldIndices() {
-
-    String new_line_separator = DecompilerContext.getNewLineSeparator();
-
-    StringBuilder buf = new StringBuilder();
-
-    for (int i = 0; i < seq.length(); i++) {
-      if (i < instrOldOffsets.size()) {
-        buf.append(instrOldOffsets.get(i));
-      }
-      else {
-        buf.append("-1");
-      }
-      buf.append(": ");
-      buf.append(seq.getInstr(i).toString());
-      buf.append(new_line_separator);
-    }
-
-    return buf.toString();
-  }
-
   public boolean isSuccessor(BasicBlock block) {
     for (BasicBlock succ : succs) {
       if (succ.id == block.id) {
@@ -198,15 +152,6 @@ public class BasicBlock implements IGraphNode {
     return false;
   }
 
-  public boolean isPredecessor(BasicBlock block) {
-    for (int i = 0; i < preds.size(); i++) {
-      if (preds.get(i).id == block.id) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   // *****************************************************************************
   // getter and setter methods
   // *****************************************************************************
@@ -215,8 +160,9 @@ public class BasicBlock implements IGraphNode {
     return instrOldOffsets;
   }
 
+  @Override
   public List<? extends IGraphNode> getPredecessors() {
-    List<BasicBlock> lst = new ArrayList<BasicBlock>(preds);
+    List<BasicBlock> lst = new ArrayList<>(preds);
     lst.addAll(predExceptions);
     return lst;
   }
@@ -225,10 +171,6 @@ public class BasicBlock implements IGraphNode {
     return preds;
   }
 
-  public void setPreds(List<BasicBlock> preds) {
-    this.preds = preds;
-  }
-
   public InstructionSequence getSeq() {
     return seq;
   }
@@ -241,25 +183,11 @@ public class BasicBlock implements IGraphNode {
     return succs;
   }
 
-  public void setSuccs(List<BasicBlock> succs) {
-    this.succs = succs;
-  }
-
-
   public List<BasicBlock> getSuccExceptions() {
     return succExceptions;
   }
 
-
-  public void setSuccExceptions(List<BasicBlock> succExceptions) {
-    this.succExceptions = succExceptions;
-  }
-
   public List<BasicBlock> getPredExceptions() {
     return predExceptions;
   }
-
-  public void setPredExceptions(List<BasicBlock> predExceptions) {
-    this.predExceptions = predExceptions;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
index 2f4761e..08223cf 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.cfg;
 
 import org.jetbrains.java.decompiler.code.*;
@@ -47,7 +33,7 @@ public class ControlFlowGraph implements CodeConstants {
 
   private Map<BasicBlock, BasicBlock> subroutines;
 
-  private Set<BasicBlock> finallyExits = new HashSet<BasicBlock>();
+  private final Set<BasicBlock> finallyExits = new HashSet<>();
 
   // *****************************************************************************
   // constructors
@@ -62,19 +48,6 @@ public class ControlFlowGraph implements CodeConstants {
   // public methods
   // *****************************************************************************
 
-  public void free() {
-
-    for (BasicBlock block : blocks) {
-      block.free();
-    }
-
-    blocks.clear();
-    first = null;
-    last = null;
-    exceptions.clear();
-    finallyExits.clear();
-  }
-
   public void removeMarkers() {
     for (BasicBlock block : blocks) {
       block.mark = 0;
@@ -94,12 +67,11 @@ public class ControlFlowGraph implements CodeConstants {
       buf.append("----- Edges -----").append(new_line_separator);
 
       List<BasicBlock> suc = block.getSuccs();
-      for (int j = 0; j < suc.size(); j++) {
-        buf.append(">>>>>>>>(regular) Block ").append(suc.get(j).id).append(new_line_separator);
+      for (BasicBlock aSuc : suc) {
+        buf.append(">>>>>>>>(regular) Block ").append(aSuc.id).append(new_line_separator);
       }
       suc = block.getSuccExceptions();
-      for (int j = 0; j < suc.size(); j++) {
-        BasicBlock handler = suc.get(j);
+      for (BasicBlock handler : suc) {
         ExceptionRangeCFG range = getExceptionRange(handler, block);
 
         if (range == null) {
@@ -170,13 +142,7 @@ public class ControlFlowGraph implements CodeConstants {
       }
     }
 
-    Iterator<Entry<BasicBlock, BasicBlock>> it = subroutines.entrySet().iterator();
-    while (it.hasNext()) {
-      Entry<BasicBlock, BasicBlock> ent = it.next();
-      if (ent.getKey() == block || ent.getValue() == block) {
-        it.remove();
-      }
-    }
+    subroutines.entrySet().removeIf(ent -> ent.getKey() == block || ent.getValue() == block);
   }
 
   public ExceptionRangeCFG getExceptionRange(BasicBlock handler, BasicBlock block) {
@@ -225,7 +191,7 @@ public class ControlFlowGraph implements CodeConstants {
 
     short[] states = findStartInstructions(instrseq);
 
-    Map<Integer, BasicBlock> mapInstrBlocks = new HashMap<Integer, BasicBlock>();
+    Map<Integer, BasicBlock> mapInstrBlocks = new HashMap<>();
     VBStyleCollection<BasicBlock, Integer> colBlocks = createBasicBlocks(states, instrseq, mapInstrBlocks);
 
     blocks = colBlocks;
@@ -244,7 +210,7 @@ public class ControlFlowGraph implements CodeConstants {
     int len = seq.length();
     short[] inststates = new short[len];
 
-    Set<Integer> excSet = new HashSet<Integer>();
+    Set<Integer> excSet = new HashSet<>();
 
     for (ExceptionHandler handler : seq.getExceptionTable().getHandlers()) {
       excSet.add(handler.from_instr);
@@ -256,7 +222,7 @@ public class ControlFlowGraph implements CodeConstants {
     for (int i = 0; i < len; i++) {
 
       // exception blocks
-      if (excSet.contains(new Integer(i))) {
+      if (excSet.contains(i)) {
         inststates[i] = 1;
       }
 
@@ -275,7 +241,7 @@ public class ControlFlowGraph implements CodeConstants {
           for (int j = dests.length - 1; j >= 0; j--) {
             inststates[dests[j]] = 1;
           }
-          inststates[swinstr.getDefaultdest()] = 1;
+          inststates[swinstr.getDefaultDestination()] = 1;
           if (i + 1 < len) {
             inststates[i + 1] = 1;
           }
@@ -293,7 +259,7 @@ public class ControlFlowGraph implements CodeConstants {
                                                                    InstructionSequence instrseq,
                                                                    Map<Integer, BasicBlock> mapInstrBlocks) {
 
-    VBStyleCollection<BasicBlock, Integer> col = new VBStyleCollection<BasicBlock, Integer>();
+    VBStyleCollection<BasicBlock, Integer> col = new VBStyleCollection<>();
 
     InstructionSequence currseq = null;
     List<Integer> lstOffs = null;
@@ -336,7 +302,7 @@ public class ControlFlowGraph implements CodeConstants {
       BasicBlock block = lstbb.get(i);
       Instruction instr = block.getLastInstruction();
 
-      boolean fallthrough = instr.canFallthrough();
+      boolean fallthrough = instr.canFallThrough();
       BasicBlock bTemp;
 
       switch (instr.group) {
@@ -350,10 +316,10 @@ public class ControlFlowGraph implements CodeConstants {
           SwitchInstruction sinstr = (SwitchInstruction)instr;
           int[] dests = sinstr.getDestinations();
 
-          bTemp = mapInstrBlocks.get(((SwitchInstruction)instr).getDefaultdest());
+          bTemp = mapInstrBlocks.get(((SwitchInstruction)instr).getDefaultDestination());
           block.addSuccessor(bTemp);
-          for (int j = 0; j < dests.length; j++) {
-            bTemp = mapInstrBlocks.get(dests[j]);
+          for (int dest1 : dests) {
+            bTemp = mapInstrBlocks.get(dest1);
             block.addSuccessor(bTemp);
           }
       }
@@ -367,9 +333,9 @@ public class ControlFlowGraph implements CodeConstants {
 
   private void setExceptionEdges(InstructionSequence instrseq, Map<Integer, BasicBlock> instrBlocks) {
 
-    exceptions = new ArrayList<ExceptionRangeCFG>();
+    exceptions = new ArrayList<>();
 
-    Map<String, ExceptionRangeCFG> mapRanges = new HashMap<String, ExceptionRangeCFG>();
+    Map<String, ExceptionRangeCFG> mapRanges = new HashMap<>();
 
     for (ExceptionHandler handler : instrseq.getExceptionTable().getHandlers()) {
 
@@ -385,7 +351,7 @@ public class ControlFlowGraph implements CodeConstants {
       }
       else {
 
-        List<BasicBlock> protectedRange = new ArrayList<BasicBlock>();
+        List<BasicBlock> protectedRange = new ArrayList<>();
         for (int j = from.id; j < to.id; j++) {
           BasicBlock block = blocks.getWithKey(j);
           protectedRange.add(block);
@@ -404,19 +370,19 @@ public class ControlFlowGraph implements CodeConstants {
 
   private void setSubroutineEdges() {
 
-    final Map<BasicBlock, BasicBlock> subroutines = new HashMap<BasicBlock, BasicBlock>();
+    final Map<BasicBlock, BasicBlock> subroutines = new LinkedHashMap<>();
 
     for (BasicBlock block : blocks) {
 
       if (block.getSeq().getLastInstr().opcode == CodeConstants.opc_jsr) {
 
-        LinkedList<BasicBlock> stack = new LinkedList<BasicBlock>();
-        LinkedList<LinkedList<BasicBlock>> stackJsrStacks = new LinkedList<LinkedList<BasicBlock>>();
+        LinkedList<BasicBlock> stack = new LinkedList<>();
+        LinkedList<LinkedList<BasicBlock>> stackJsrStacks = new LinkedList<>();
 
-        Set<BasicBlock> setVisited = new HashSet<BasicBlock>();
+        Set<BasicBlock> setVisited = new HashSet<>();
 
         stack.add(block);
-        stackJsrStacks.add(new LinkedList<BasicBlock>());
+        stackJsrStacks.add(new LinkedList<>());
 
         while (!stack.isEmpty()) {
 
@@ -449,7 +415,7 @@ public class ControlFlowGraph implements CodeConstants {
             for (BasicBlock succ : node.getSuccs()) {
               if (!setVisited.contains(succ)) {
                 stack.add(succ);
-                stackJsrStacks.add(new LinkedList<BasicBlock>(jsrstack));
+                stackJsrStacks.add(new LinkedList<>(jsrstack));
               }
             }
           }
@@ -480,7 +446,7 @@ public class ControlFlowGraph implements CodeConstants {
 
   private int processJsrRanges() {
 
-    List<JsrRecord> lstJsrAll = new ArrayList<JsrRecord>();
+    List<JsrRecord> lstJsrAll = new ArrayList<>();
 
     // get all jsr ranges
     for (Entry<BasicBlock, BasicBlock> ent : subroutines.entrySet()) {
@@ -492,7 +458,7 @@ public class ControlFlowGraph implements CodeConstants {
 
     // sort ranges
     // FIXME: better sort order
-    List<JsrRecord> lstJsr = new ArrayList<JsrRecord>();
+    List<JsrRecord> lstJsr = new ArrayList<>();
     for (JsrRecord arr : lstJsrAll) {
       int i = 0;
       for (; i < lstJsr.size(); i++) {
@@ -514,7 +480,7 @@ public class ControlFlowGraph implements CodeConstants {
         Set<BasicBlock> set1 = arr1.range;
 
         if (!set.contains(arr1.jsr) && !set1.contains(arr.jsr)) { // rang 0 doesn't contain entry 1 and vice versa
-          Set<BasicBlock> setc = new HashSet<BasicBlock>(set);
+          Set<BasicBlock> setc = new HashSet<>(set);
           setc.retainAll(set1);
 
           if (!setc.isEmpty()) {
@@ -530,9 +496,9 @@ public class ControlFlowGraph implements CodeConstants {
 
   private Set<BasicBlock> getJsrRange(BasicBlock jsr, BasicBlock ret) {
 
-    Set<BasicBlock> blocks = new HashSet<BasicBlock>();
+    Set<BasicBlock> blocks = new HashSet<>();
 
-    List<BasicBlock> lstNodes = new LinkedList<BasicBlock>();
+    List<BasicBlock> lstNodes = new LinkedList<>();
     lstNodes.add(jsr);
 
     BasicBlock dom = jsr.getSuccs().get(0);
@@ -594,8 +560,8 @@ public class ControlFlowGraph implements CodeConstants {
 
   private void splitJsrRange(BasicBlock jsr, BasicBlock ret, Set<BasicBlock> common_blocks) {
 
-    List<BasicBlock> lstNodes = new LinkedList<BasicBlock>();
-    Map<Integer, BasicBlock> mapNewNodes = new HashMap<Integer, BasicBlock>();
+    List<BasicBlock> lstNodes = new LinkedList<>();
+    Map<Integer, BasicBlock> mapNewNodes = new HashMap<>();
 
     lstNodes.add(jsr);
     mapNewNodes.put(jsr.id, jsr);
@@ -631,9 +597,8 @@ public class ControlFlowGraph implements CodeConstants {
             node.replaceSuccessor(child, mapNewNodes.get(childid));
           }
           else if (common_blocks.contains(child)) {
-
             // make a copy of the current block
-            BasicBlock copy = (BasicBlock)child.clone();
+            BasicBlock copy = child.clone();
             copy.id = ++last_id;
             // copy all successors
             if (copy.getLastInstruction().opcode == CodeConstants.opc_ret &&
@@ -680,14 +645,14 @@ public class ControlFlowGraph implements CodeConstants {
       ExceptionRangeCFG range = exceptions.get(i);
       List<BasicBlock> lstRange = range.getProtectedRange();
 
-      HashSet<BasicBlock> setBoth = new HashSet<BasicBlock>(common_blocks);
+      HashSet<BasicBlock> setBoth = new HashSet<>(common_blocks);
       setBoth.retainAll(lstRange);
 
       if (setBoth.size() > 0) {
         List<BasicBlock> lstNewRange;
 
         if (setBoth.size() == lstRange.size()) {
-          lstNewRange = new ArrayList<BasicBlock>();
+          lstNewRange = new ArrayList<>();
           ExceptionRangeCFG newRange = new ExceptionRangeCFG(lstNewRange,
                                                              mapNewNodes.get(range.getHandler().id), range.getExceptionTypes());
           exceptions.add(newRange);
@@ -751,7 +716,7 @@ public class ControlFlowGraph implements CodeConstants {
       if (suc.mark != 1) {
 
         DataPoint point = new DataPoint();
-        point.setLocalVariables(new ArrayList<VarType>(data.getLocalVariables()));
+        point.setLocalVariables(new ArrayList<>(data.getLocalVariables()));
         point.getStack().push(new VarType(CodeConstants.TYPE_OBJECT, 0, null));
 
         removeJsrInstructions(pool, suc, point);
@@ -774,18 +739,18 @@ public class ControlFlowGraph implements CodeConstants {
 
   public List<BasicBlock> getReversePostOrder() {
 
-    List<BasicBlock> res = new LinkedList<BasicBlock>();
+    List<BasicBlock> res = new LinkedList<>();
     addToReversePostOrderListIterative(first, res);
 
     return res;
   }
 
-  private static void addToReversePostOrderListIterative(BasicBlock root, List<BasicBlock> lst) {
+  private static void addToReversePostOrderListIterative(BasicBlock root, List<? super BasicBlock> lst) {
 
-    LinkedList<BasicBlock> stackNode = new LinkedList<BasicBlock>();
-    LinkedList<Integer> stackIndex = new LinkedList<Integer>();
+    LinkedList<BasicBlock> stackNode = new LinkedList<>();
+    LinkedList<Integer> stackIndex = new LinkedList<>();
 
-    Set<BasicBlock> setVisited = new HashSet<BasicBlock>();
+    Set<BasicBlock> setVisited = new HashSet<>();
 
     stackNode.add(root);
     stackIndex.add(0);
@@ -797,7 +762,7 @@ public class ControlFlowGraph implements CodeConstants {
 
       setVisited.add(node);
 
-      List<BasicBlock> lstSuccs = new ArrayList<BasicBlock>(node.getSuccs());
+      List<BasicBlock> lstSuccs = new ArrayList<>(node.getSuccs());
       lstSuccs.addAll(node.getSuccExceptions());
 
       for (; index < lstSuccs.size(); index++) {
@@ -830,10 +795,6 @@ public class ControlFlowGraph implements CodeConstants {
     return blocks;
   }
 
-  public void setBlocks(VBStyleCollection<BasicBlock, Integer> blocks) {
-    this.blocks = blocks;
-  }
-
   public BasicBlock getFirst() {
     return first;
   }
@@ -842,39 +803,15 @@ public class ControlFlowGraph implements CodeConstants {
     this.first = first;
   }
 
-  public List<BasicBlock> getEndBlocks() {
-    return last.getPreds();
-  }
-
   public List<ExceptionRangeCFG> getExceptions() {
     return exceptions;
   }
 
-  public void setExceptions(List<ExceptionRangeCFG> exceptions) {
-    this.exceptions = exceptions;
-  }
-
   public BasicBlock getLast() {
     return last;
   }
 
-  public void setLast(BasicBlock last) {
-    this.last = last;
-  }
-
-  public Map<BasicBlock, BasicBlock> getSubroutines() {
-    return subroutines;
-  }
-
-  public void setSubroutines(Map<BasicBlock, BasicBlock> subroutines) {
-    this.subroutines = subroutines;
-  }
-
   public Set<BasicBlock> getFinallyExits() {
     return finallyExits;
   }
-
-  public void setFinallyExits(HashSet<BasicBlock> finallyExits) {
-    this.finallyExits = finallyExits;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java b/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
index 47e0e21..ce143aa 100644
--- a/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
+++ b/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
@@ -1,33 +1,15 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.cfg;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
+import java.util.stream.Collectors;
 
 public class ExceptionRangeCFG {
-
-  private List<BasicBlock> protectedRange = new ArrayList<BasicBlock>(); // FIXME: replace with set
-
+  private final List<BasicBlock> protectedRange; // FIXME: replace with set
   private BasicBlock handler;
-
   private List<String> exceptionTypes;
 
   public ExceptionRangeCFG(List<BasicBlock> protectedRange, BasicBlock handler, List<String> exceptionType) {
@@ -35,7 +17,7 @@ public class ExceptionRangeCFG {
     this.handler = handler;
 
     if (exceptionType != null) {
-      this.exceptionTypes = new ArrayList<String>(exceptionType);
+      this.exceptionTypes = new ArrayList<>(exceptionType);
     }
   }
 
@@ -43,10 +25,9 @@ public class ExceptionRangeCFG {
     return protectedRange.contains(handler);
   }
 
+  @Override
   public String toString() {
-
     String new_line_separator = DecompilerContext.getNewLineSeparator();
-
     StringBuilder buf = new StringBuilder();
 
     buf.append("exceptionType:");
@@ -57,8 +38,8 @@ public class ExceptionRangeCFG {
 
     buf.append("handler: ").append(handler.id).append(new_line_separator);
     buf.append("range: ");
-    for (int i = 0; i < protectedRange.size(); i++) {
-      buf.append(protectedRange.get(i).id).append(" ");
+    for (BasicBlock block : protectedRange) {
+      buf.append(block.id).append(" ");
     }
     buf.append(new_line_separator);
 
@@ -77,16 +58,11 @@ public class ExceptionRangeCFG {
     return protectedRange;
   }
 
-  public void setProtectedRange(List<BasicBlock> protectedRange) {
-    this.protectedRange = protectedRange;
-  }
-
   public List<String> getExceptionTypes() {
     return this.exceptionTypes;
   }
 
   public void addExceptionType(String exceptionType) {
-
     if (this.exceptionTypes == null) {
       return;
     }
@@ -100,30 +76,6 @@ public class ExceptionRangeCFG {
   }
 
   public String getUniqueExceptionsString() {
-
-    if (exceptionTypes == null) {
-      return null;
-    }
-
-    Set<String> setExceptionStrings = new HashSet<String>();
-
-    for (String exceptionType : exceptionTypes) { // normalize order
-      setExceptionStrings.add(exceptionType);
-    }
-
-    String ret = "";
-    for (String exception : setExceptionStrings) {
-      if (!ret.isEmpty()) {
-        ret += ":";
-      }
-      ret += exception;
-    }
-
-    return ret;
+    return exceptionTypes != null ? exceptionTypes.stream().distinct().collect(Collectors.joining(":")) : null;
   }
-
-
-  //	public void setExceptionType(String exceptionType) {
-  //		this.exceptionType = exceptionType;
-  //	}
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/interpreter/InstructionImpact.java b/src/org/jetbrains/java/decompiler/code/interpreter/InstructionImpact.java
index 553ad84..5c56593 100644
--- a/src/org/jetbrains/java/decompiler/code/interpreter/InstructionImpact.java
+++ b/src/org/jetbrains/java/decompiler/code/interpreter/InstructionImpact.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.code.interpreter;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -339,7 +325,6 @@ public class InstructionImpact {
 
 
   public static void stepTypes(DataPoint data, Instruction instr, ConstantPool pool) {
-
     ListStack<VarType> stack = data.getStack();
     int[][] arr = stack_impact[instr.opcode];
 
@@ -351,8 +336,7 @@ public class InstructionImpact {
 
       if (read != null) {
         int depth = 0;
-        for (int i = 0; i < read.length; i++) {
-          int type = read[i];
+        for (int type : read) {
           depth++;
           if (type == CodeConstants.TYPE_LONG ||
               type == CodeConstants.TYPE_DOUBLE) {
@@ -364,8 +348,7 @@ public class InstructionImpact {
       }
 
       if (write != null) {
-        for (int i = 0; i < write.length; i++) {
-          int type = write[i];
+        for (int type : write) {
           stack.push(new VarType(type));
           if (type == CodeConstants.TYPE_LONG ||
               type == CodeConstants.TYPE_DOUBLE) {
@@ -395,7 +378,7 @@ public class InstructionImpact {
       case CodeConstants.opc_ldc:
       case CodeConstants.opc_ldc_w:
       case CodeConstants.opc_ldc2_w:
-        PooledConstant constant = pool.getConstant(instr.getOperand(0));
+        PooledConstant constant = pool.getConstant(instr.operand(0));
         switch (constant.type) {
           case CodeConstants.CONSTANT_Integer:
             stack.push(new VarType(CodeConstants.TYPE_INT));
@@ -423,7 +406,7 @@ public class InstructionImpact {
         }
         break;
       case CodeConstants.opc_aload:
-        var1 = data.getVariable(instr.getOperand(0));
+        var1 = data.getVariable(instr.operand(0));
         if (var1 != null) {
           stack.push(var1);
         }
@@ -436,7 +419,7 @@ public class InstructionImpact {
         stack.push(new VarType(var1.type, var1.arrayDim - 1, var1.value));
         break;
       case CodeConstants.opc_astore:
-        data.setVariable(instr.getOperand(0), stack.pop());
+        data.setVariable(instr.operand(0), stack.pop());
         break;
       case CodeConstants.opc_dup:
       case CodeConstants.opc_dup_x1:
@@ -458,7 +441,7 @@ public class InstructionImpact {
       case CodeConstants.opc_getfield:
         stack.pop();
       case CodeConstants.opc_getstatic:
-        ck = pool.getLinkConstant(instr.getOperand(0));
+        ck = pool.getLinkConstant(instr.operand(0));
         var1 = new VarType(ck.descriptor);
         stack.push(var1);
         if (var1.stackSize == 2) {
@@ -468,7 +451,7 @@ public class InstructionImpact {
       case CodeConstants.opc_putfield:
         stack.pop();
       case CodeConstants.opc_putstatic:
-        ck = pool.getLinkConstant(instr.getOperand(0));
+        ck = pool.getLinkConstant(instr.operand(0));
         var1 = new VarType(ck.descriptor);
         stack.pop(var1.stackSize);
         break;
@@ -478,8 +461,8 @@ public class InstructionImpact {
         stack.pop();
       case CodeConstants.opc_invokestatic:
       case CodeConstants.opc_invokedynamic:
-        if (instr.opcode != CodeConstants.opc_invokedynamic || instr.bytecode_version >= CodeConstants.BYTECODE_JAVA_7) {
-          ck = pool.getLinkConstant(instr.getOperand(0));
+        if (instr.opcode != CodeConstants.opc_invokedynamic || instr.bytecodeVersion >= CodeConstants.BYTECODE_JAVA_7) {
+          ck = pool.getLinkConstant(instr.operand(0));
           MethodDescriptor md = MethodDescriptor.parseDescriptor(ck.descriptor);
           for (int i = 0; i < md.params.length; i++) {
             stack.pop(md.params[i].stackSize);
@@ -493,12 +476,12 @@ public class InstructionImpact {
         }
         break;
       case CodeConstants.opc_new:
-        cn = pool.getPrimitiveConstant(instr.getOperand(0));
+        cn = pool.getPrimitiveConstant(instr.operand(0));
         stack.push(new VarType(CodeConstants.TYPE_OBJECT, 0, cn.getString()));
         break;
       case CodeConstants.opc_newarray:
         stack.pop();
-        stack.push(new VarType(arr_type[instr.getOperand(0) - 4], 1).resizeArrayDim(1));
+        stack.push(new VarType(arr_type[instr.operand(0) - 4], 1).resizeArrayDim(1));
         break;
       case CodeConstants.opc_athrow:
         var1 = stack.pop();
@@ -508,14 +491,14 @@ public class InstructionImpact {
       case CodeConstants.opc_checkcast:
       case CodeConstants.opc_instanceof:
         stack.pop();
-        cn = pool.getPrimitiveConstant(instr.getOperand(0));
+        cn = pool.getPrimitiveConstant(instr.operand(0));
         stack.push(new VarType(CodeConstants.TYPE_OBJECT, 0, cn.getString()));
         break;
       case CodeConstants.opc_anewarray:
       case CodeConstants.opc_multianewarray:
-        int dimensions = (instr.opcode == CodeConstants.opc_anewarray) ? 1 : instr.getOperand(1);
+        int dimensions = (instr.opcode == CodeConstants.opc_anewarray) ? 1 : instr.operand(1);
         stack.pop(dimensions);
-        cn = pool.getPrimitiveConstant(instr.getOperand(0));
+        cn = pool.getPrimitiveConstant(instr.operand(0));
         if (cn.isArray) {
           var1 = new VarType(CodeConstants.TYPE_OBJECT, 0, cn.getString());
           var1 = var1.resizeArrayDim(var1.arrayDim + dimensions);
diff --git a/src/org/jetbrains/java/decompiler/code/interpreter/Util.java b/src/org/jetbrains/java/decompiler/code/interpreter/Util.java
deleted file mode 100644
index bf1e5eb..0000000
--- a/src/org/jetbrains/java/decompiler/code/interpreter/Util.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.interpreter;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-import org.jetbrains.java.decompiler.struct.StructClass;
-import org.jetbrains.java.decompiler.struct.StructContext;
-
-
-// FIXME: move to StructContext
-public class Util {
-
-  private static final String[][] runtime_exceptions = {
-
-    null,                        //		public final static int		opc_nop = 0;
-    null,                        //		public final static int		opc_aconst_null = 1;
-    null,                        //		public final static int		opc_iconst_m1 = 2;
-    null,                        //		public final static int		opc_iconst_0 = 3;
-    null,                        //		public final static int		opc_iconst_1 = 4;
-    null,                        //		public final static int		opc_iconst_2 = 5;
-    null,                        //		public final static int		opc_iconst_3 = 6;
-    null,                        //		public final static int		opc_iconst_4 = 7;
-    null,                        //		public final static int		opc_iconst_5 = 8;
-    null,                        //		public final static int		opc_lconst_0 = 9;
-    null,                        //		public final static int		opc_lconst_1 = 10;
-    null,                        //		public final static int		opc_fconst_0 = 11;
-    null,                        //		public final static int		opc_fconst_1 = 12;
-    null,                        //		public final static int		opc_fconst_2 = 13;
-    null,                        //		public final static int		opc_dconst_0 = 14;
-    null,                        //		public final static int		opc_dconst_1 = 15;
-    null,                        //		public final static int		opc_bipush = 16;
-    null,                        //		public final static int		opc_sipush = 17;
-    null,                        //		public final static int		opc_ldc = 18;
-    null,                        //		public final static int		opc_ldc_w = 19;
-    null,                        //		public final static int		opc_ldc2_w = 20;
-    null,                        //		public final static int		opc_iload = 21;
-    null,                        //		public final static int		opc_lload = 22;
-    null,                        //		public final static int		opc_fload = 23;
-    null,                        //		public final static int		opc_dload = 24;
-    null,                        //		public final static int		opc_aload = 25;
-    null,                        //		public final static int		opc_iload_0 = 26;
-    null,                        //		public final static int		opc_iload_1 = 27;
-    null,                        //		public final static int		opc_iload_2 = 28;
-    null,                        //		public final static int		opc_iload_3 = 29;
-    null,                        //		public final static int		opc_lload_0 = 30;
-    null,                        //		public final static int		opc_lload_1 = 31;
-    null,                        //		public final static int		opc_lload_2 = 32;
-    null,                        //		public final static int		opc_lload_3 = 33;
-    null,                        //		public final static int		opc_fload_0 = 34;
-    null,                        //		public final static int		opc_fload_1 = 35;
-    null,                        //		public final static int		opc_fload_2 = 36;
-    null,                        //		public final static int		opc_fload_3 = 37;
-    null,                        //		public final static int		opc_dload_0 = 38;
-    null,                        //		public final static int		opc_dload_1 = 39;
-    null,                        //		public final static int		opc_dload_2 = 40;
-    null,                        //		public final static int		opc_dload_3 = 41;
-    null,                        //		public final static int		opc_aload_0 = 42;
-    null,                        //		public final static int		opc_aload_1 = 43;
-    null,                        //		public final static int		opc_aload_2 = 44;
-    null,                        //		public final static int		opc_aload_3 = 45;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_iaload = 46;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_laload = 47;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_faload = 48;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_daload = 49;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_aaload = 50;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_baload = 51;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_caload = 52;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_saload = 53;
-    null,                        //		public final static int		opc_istore = 54;
-    null,                        //		public final static int		opc_lstore = 55;
-    null,                        //		public final static int		opc_fstore = 56;
-    null,                        //		public final static int		opc_dstore = 57;
-    null,                        //		public final static int		opc_astore = 58;
-    null,                        //		public final static int		opc_istore_0 = 59;
-    null,                        //		public final static int		opc_istore_1 = 60;
-    null,                        //		public final static int		opc_istore_2 = 61;
-    null,                        //		public final static int		opc_istore_3 = 62;
-    null,                        //		public final static int		opc_lstore_0 = 63;
-    null,                        //		public final static int		opc_lstore_1 = 64;
-    null,                        //		public final static int		opc_lstore_2 = 65;
-    null,                        //		public final static int		opc_lstore_3 = 66;
-    null,                        //		public final static int		opc_fstore_0 = 67;
-    null,                        //		public final static int		opc_fstore_1 = 68;
-    null,                        //		public final static int		opc_fstore_2 = 69;
-    null,                        //		public final static int		opc_fstore_3 = 70;
-    null,                        //		public final static int		opc_dstore_0 = 71;
-    null,                        //		public final static int		opc_dstore_1 = 72;
-    null,                        //		public final static int		opc_dstore_2 = 73;
-    null,                        //		public final static int		opc_dstore_3 = 74;
-    null,                        //		public final static int		opc_astore_0 = 75;
-    null,                        //		public final static int		opc_astore_1 = 76;
-    null,                        //		public final static int		opc_astore_2 = 77;
-    null,                        //		public final static int		opc_astore_3 = 78;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_iastore = 79;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_lastore = 80;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_fastore = 81;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_dastore = 82;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException", "java/lang/ArrayStoreException"},
-    //		public final static int		opc_aastore = 83;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_bastore = 84;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_castore = 85;
-    {"java/lang/NullPointerException", "java/lang/ArrayIndexOutOfBoundsException"},
-    //		public final static int		opc_sastore = 86;
-    null,                        //		public final static int		opc_pop = 87;
-    null,                        //		public final static int		opc_pop2 = 88;
-    null,                        //		public final static int		opc_dup = 89;
-    null,                        //		public final static int		opc_dup_x1 = 90;
-    null,                        //		public final static int		opc_dup_x2 = 91;
-    null,                        //		public final static int		opc_dup2 = 92;
-    null,                        //		public final static int		opc_dup2_x1 = 93;
-    null,                        //		public final static int		opc_dup2_x2 = 94;
-    null,                        //		public final static int		opc_swap = 95;
-    null,                        //		public final static int		opc_iadd = 96;
-    null,                        //		public final static int		opc_ladd = 97;
-    null,                        //		public final static int		opc_fadd = 98;
-    null,                        //		public final static int		opc_dadd = 99;
-    null,                        //		public final static int		opc_isub = 100;
-    null,                        //		public final static int		opc_lsub = 101;
-    null,                        //		public final static int		opc_fsub = 102;
-    null,                        //		public final static int		opc_dsub = 103;
-    null,                        //		public final static int		opc_imul = 104;
-    null,                        //		public final static int		opc_lmul = 105;
-    null,                        //		public final static int		opc_fmul = 106;
-    null,                        //		public final static int		opc_dmul = 107;
-    {"java/lang/ArithmeticException"},                        //		public final static int		opc_idiv = 108;
-    {"java/lang/ArithmeticException"},                        //		public final static int		opc_ldiv = 109;
-    null,                        //		public final static int		opc_fdiv = 110;
-    null,                        //		public final static int		opc_ddiv = 111;
-    {"java/lang/ArithmeticException"},                        //		public final static int		opc_irem = 112;
-    {"java/lang/ArithmeticException"},                        //		public final static int		opc_lrem = 113;
-    null,                        //		public final static int		opc_frem = 114;
-    null,                        //		public final static int		opc_drem = 115;
-    null,                        //		public final static int		opc_ineg = 116;
-    null,                        //		public final static int		opc_lneg = 117;
-    null,                        //		public final static int		opc_fneg = 118;
-    null,                        //		public final static int		opc_dneg = 119;
-    null,                        //		public final static int		opc_ishl = 120;
-    null,                        //		public final static int		opc_lshl = 121;
-    null,                        //		public final static int		opc_ishr = 122;
-    null,                        //		public final static int		opc_lshr = 123;
-    null,                        //		public final static int		opc_iushr = 124;
-    null,                        //		public final static int		opc_lushr = 125;
-    null,                        //		public final static int		opc_iand = 126;
-    null,                        //		public final static int		opc_land = 127;
-    null,                        //		public final static int		opc_ior = 128;
-    null,                        //		public final static int		opc_lor = 129;
-    null,                        //		public final static int		opc_ixor = 130;
-    null,                        //		public final static int		opc_lxor = 131;
-    null,                        //		public final static int		opc_iinc = 132;
-    null,                        //		public final static int		opc_i2l = 133;
-    null,                        //		public final static int		opc_i2f = 134;
-    null,                        //		public final static int		opc_i2d = 135;
-    null,                        //		public final static int		opc_l2i = 136;
-    null,                        //		public final static int		opc_l2f = 137;
-    null,                        //		public final static int		opc_l2d = 138;
-    null,                        //		public final static int		opc_f2i = 139;
-    null,                        //		public final static int		opc_f2l = 140;
-    null,                        //		public final static int		opc_f2d = 141;
-    null,                        //		public final static int		opc_d2i = 142;
-    null,                        //		public final static int		opc_d2l = 143;
-    null,                        //		public final static int		opc_d2f = 144;
-    null,                        //		public final static int		opc_i2b = 145;
-    null,                        //		public final static int		opc_i2c = 146;
-    null,                        //		public final static int		opc_i2s = 147;
-    null,                        //		public final static int		opc_lcmp = 148;
-    null,                        //		public final static int		opc_fcmpl = 149;
-    null,                        //		public final static int		opc_fcmpg = 150;
-    null,                        //		public final static int		opc_dcmpl = 151;
-    null,                        //		public final static int		opc_dcmpg = 152;
-    null,                        //		public final static int		opc_ifeq = 153;
-    null,                        //		public final static int		opc_ifne = 154;
-    null,                        //		public final static int		opc_iflt = 155;
-    null,                        //		public final static int		opc_ifge = 156;
-    null,                        //		public final static int		opc_ifgt = 157;
-    null,                        //		public final static int		opc_ifle = 158;
-    null,                        //		public final static int		opc_if_icmpeq = 159;
-    null,                        //		public final static int		opc_if_icmpne = 160;
-    null,                        //		public final static int		opc_if_icmplt = 161;
-    null,                        //		public final static int		opc_if_icmpge = 162;
-    null,                        //		public final static int		opc_if_icmpgt = 163;
-    null,                        //		public final static int		opc_if_icmple = 164;
-    null,                        //		public final static int		opc_if_acmpeq = 165;
-    null,                        //		public final static int		opc_if_acmpne = 166;
-    null,                        //		public final static int		opc_goto = 167;
-    null,                        //		public final static int		opc_jsr = 168;
-    null,                        //		public final static int		opc_ret = 169;
-    null,                        //		public final static int		opc_tableswitch = 170;
-    null,                        //		public final static int		opc_lookupswitch = 171;
-    {"java/lang/IllegalMonitorStateException"},                        //		public final static int		opc_ireturn = 172;
-    {"java/lang/IllegalMonitorStateException"},                        //		public final static int		opc_lreturn = 173;
-    {"java/lang/IllegalMonitorStateException"},                        //		public final static int		opc_freturn = 174;
-    {"java/lang/IllegalMonitorStateException"},                        //		public final static int		opc_dreturn = 175;
-    {"java/lang/IllegalMonitorStateException"},                        //		public final static int		opc_areturn = 176;
-    {"java/lang/IllegalMonitorStateException"},                        //		public final static int		opc_return = 177;
-    null,                        //		public final static int		opc_getstatic = 178;
-    null,                        //		public final static int		opc_putstatic = 179;
-    {"java/lang/NullPointerException"},                        //		public final static int		opc_getfield = 180;
-    {"java/lang/NullPointerException"},                        //		public final static int		opc_putfield = 181;
-    {"java/lang/NullPointerException", "java/lang/AbstractMethodError", "java/lang/UnsatisfiedLinkError"},
-    //		public final static int		opc_invokevirtual = 182;
-    {"java/lang/NullPointerException", "java/lang/UnsatisfiedLinkError"},
-    //		public final static int		opc_invokespecial = 183;
-    {"java/lang/UnsatisfiedLinkError"},                        //		public final static int		opc_invokestatic = 184;
-    {"java/lang/NullPointerException", "java/lang/IncompatibleClassChangeError", "java/lang/IllegalAccessError",
-      "java/lang/java/lang/AbstractMethodError", "java/lang/UnsatisfiedLinkError"},
-    //		public final static int		opc_invokeinterface = 185;
-    null,                        //		public final static int		opc_xxxunusedxxx = 186;
-    null,                        //		public final static int		opc_new = 187;
-    {"java/lang/NegativeArraySizeException"},                        //		public final static int		opc_newarray = 188;
-    {"java/lang/NegativeArraySizeException"},                        //		public final static int		opc_anewarray = 189;
-    {"java/lang/NullPointerException"},                        //		public final static int		opc_arraylength = 190;
-    {"java/lang/NullPointerException", "java/lang/IllegalMonitorStateException"},
-    //		public final static int		opc_athrow = 191;
-    {"java/lang/ClassCastException"},                        //		public final static int		opc_checkcast = 192;
-    null,                        //		public final static int		opc_instanceof = 193;
-    {"java/lang/NullPointerException"},                        //		public final static int		opc_monitorenter = 194;
-    {"java/lang/NullPointerException", "java/lang/IllegalMonitorStateException"},
-    //		public final static int		opc_monitorexit = 195;
-    null,                        //		public final static int		opc_wide = 196;
-    {"java/lang/NegativeArraySizeException"},                        //		public final static int		opc_multianewarray = 197;
-    null,                        //		public final static int		opc_ifnull = 198;
-    null,                        //		public final static int		opc_ifnonnull = 199;
-    null,                        //		public final static int		opc_goto_w = 200;
-    null,                        //		public final static int		opc_jsr_w = 201;
-  };
-
-
-  public static boolean instanceOf(StructContext context, String valclass, String refclass) {
-
-    if (valclass.equals(refclass)) {
-      return true;
-    }
-
-    StructClass cl = context.getClass(valclass);
-    if (cl == null) {
-      return false;
-    }
-
-    if (cl.superClass != null && instanceOf(context, cl.superClass.getString(), refclass)) {
-      return true;
-    }
-
-    int[] interfaces = cl.getInterfaces();
-    for (int i = 0; i < interfaces.length; i++) {
-      String intfc = cl.getPool().getPrimitiveConstant(interfaces[i]).getString();
-
-      if (instanceOf(context, intfc, refclass)) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-
-  public static String[] getRuntimeExceptions(Instruction instr) {
-    return runtime_exceptions[instr.opcode];
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/ALOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ALOAD.java
deleted file mode 100644
index 7923b84..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/ALOAD.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class ALOAD extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_aload_0, opc_aload_1, opc_aload_2, opc_aload_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_aload);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        return 4;
-      }
-      else {
-        return 2;
-      }
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/ANEWARRAY.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ANEWARRAY.java
deleted file mode 100644
index d514ffe..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/ANEWARRAY.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class ANEWARRAY extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_anewarray);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/ASTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ASTORE.java
deleted file mode 100644
index 046f34a..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/ASTORE.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class ASTORE extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_astore_0, opc_astore_1, opc_astore_2, opc_astore_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_astore);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        return 4;
-      }
-      else {
-        return 2;
-      }
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/BIPUSH.java b/src/org/jetbrains/java/decompiler/code/optinstructions/BIPUSH.java
deleted file mode 100644
index 2ccebd4..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/BIPUSH.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class BIPUSH extends Instruction {
-
-  private static final int[] opcodes =
-    new int[]{opc_iconst_m1, opc_iconst_0, opc_iconst_1, opc_iconst_2, opc_iconst_3, opc_iconst_4, opc_iconst_5};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int value = getOperand(0);
-    if (value < -1 || value > 5) {
-      out.writeByte(opc_bipush);
-      out.writeByte(value);
-    }
-    else {
-      out.writeByte(opcodes[value + 1]);
-    }
-  }
-
-  public int length() {
-    int value = getOperand(0);
-    if (value < -1 || value > 5) {
-      return 2;
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/CHECKCAST.java b/src/org/jetbrains/java/decompiler/code/optinstructions/CHECKCAST.java
deleted file mode 100644
index 9a42f65..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/CHECKCAST.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class CHECKCAST extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_checkcast);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
-
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/DLOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/DLOAD.java
deleted file mode 100644
index fa97db2..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/DLOAD.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class DLOAD extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_dload_0, opc_dload_1, opc_dload_2, opc_dload_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_dload);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        return 4;
-      }
-      else {
-        return 2;
-      }
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/DSTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/DSTORE.java
deleted file mode 100644
index 10e1283..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/DSTORE.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class DSTORE extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_dstore_0, opc_dstore_1, opc_dstore_2, opc_dstore_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_dstore);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        return 4;
-      }
-      else {
-        return 2;
-      }
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/FLOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/FLOAD.java
deleted file mode 100644
index c775ec8..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/FLOAD.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class FLOAD extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_fload_0, opc_fload_1, opc_fload_2, opc_fload_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_fload);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        return 4;
-      }
-      else {
-        return 2;
-      }
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/FSTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/FSTORE.java
deleted file mode 100644
index c76b374..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/FSTORE.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class FSTORE extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_fstore_0, opc_fstore_1, opc_fstore_2, opc_fstore_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_fstore);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        return 4;
-      }
-      else {
-        return 2;
-      }
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/GETSTATIC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/GETSTATIC.java
deleted file mode 100644
index c1401a6..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/GETSTATIC.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class GETSTATIC extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_getstatic);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO.java b/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO.java
deleted file mode 100644
index 97374c0..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.JumpInstruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class GOTO extends JumpInstruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int operand = getOperand(0);
-    if (operand < -32768 || operand > 32767) {
-      out.writeByte(opc_goto_w);
-      out.writeInt(operand);
-    }
-    else {
-      out.writeByte(opc_goto);
-      out.writeShort(operand);
-    }
-  }
-
-  public int length() {
-    int operand = getOperand(0);
-    if (operand < -32768 || operand > 32767) {
-      return 5;
-    }
-    else {
-      return 3;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO_W.java b/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO_W.java
deleted file mode 100644
index 56ba9e8..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO_W.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.JumpInstruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class GOTO_W extends JumpInstruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_goto_w);
-    out.writeInt(getOperand(0));
-  }
-
-  public int length() {
-    return 5;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/IINC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/IINC.java
deleted file mode 100644
index 05b446c..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/IINC.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class IINC extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    if (wide) {
-      out.writeByte(opc_wide);
-    }
-    out.writeByte(opc_iinc);
-    if (wide) {
-      out.writeShort(getOperand(0));
-      out.writeShort(getOperand(1));
-    }
-    else {
-      out.writeByte(getOperand(0));
-      out.writeByte(getOperand(1));
-    }
-  }
-
-  public int length() {
-    return wide ? 6 : 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/ILOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ILOAD.java
deleted file mode 100644
index d328e23..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/ILOAD.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class ILOAD extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_iload_0, opc_iload_1, opc_iload_2, opc_iload_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_iload);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      return wide ? 4 : 2;
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INSTANCEOF.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INSTANCEOF.java
deleted file mode 100644
index f93d5b8..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INSTANCEOF.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class INSTANCEOF extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_instanceof);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEDYNAMIC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEDYNAMIC.java
deleted file mode 100644
index 917c5bd..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEDYNAMIC.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class INVOKEDYNAMIC extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_invokedynamic);
-    out.writeShort(getOperand(0));
-    out.writeByte(0);
-    out.writeByte(0);
-  }
-
-  public int length() {
-    return 5;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEINTERFACE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEINTERFACE.java
deleted file mode 100644
index 51259ff..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEINTERFACE.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class INVOKEINTERFACE extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_invokeinterface);
-    out.writeShort(getOperand(0));
-    out.writeByte(getOperand(1));
-    out.writeByte(0);
-  }
-
-  public int length() {
-    return 5;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESPECIAL.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESPECIAL.java
deleted file mode 100644
index 2436803..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESPECIAL.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class INVOKESPECIAL extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_invokespecial);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESTATIC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESTATIC.java
deleted file mode 100644
index f036a1d..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESTATIC.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class INVOKESTATIC extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_invokestatic);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEVIRTUAL.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEVIRTUAL.java
deleted file mode 100644
index ca3bcd3..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEVIRTUAL.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class INVOKEVIRTUAL extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_invokevirtual);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/ISTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ISTORE.java
deleted file mode 100644
index 4ee2d49..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/ISTORE.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class ISTORE extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_istore_0, opc_istore_1, opc_istore_2, opc_istore_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_istore);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      return wide ? 4 : 2;
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/JSR.java b/src/org/jetbrains/java/decompiler/code/optinstructions/JSR.java
deleted file mode 100644
index bb000a7..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/JSR.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.JumpInstruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class JSR extends JumpInstruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int operand = getOperand(0);
-    if (operand < -32768 || operand > 32767) {
-      out.writeByte(opc_jsr_w);
-      out.writeInt(operand);
-    }
-    else {
-      out.writeByte(opc_jsr);
-      out.writeShort(operand);
-    }
-  }
-
-  public int length() {
-    int operand = getOperand(0);
-    if (operand < -32768 || operand > 32767) {
-      return 5;
-    }
-    else {
-      return 3;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/JSR_W.java b/src/org/jetbrains/java/decompiler/code/optinstructions/JSR_W.java
deleted file mode 100644
index fb04ed9..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/JSR_W.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.JumpInstruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class JSR_W extends JumpInstruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_jsr_w);
-    out.writeInt(getOperand(0));
-  }
-
-  public int length() {
-    return 5;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LLOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LLOAD.java
deleted file mode 100644
index 8381d8c..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LLOAD.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class LLOAD extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_lload_0, opc_lload_1, opc_lload_2, opc_lload_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_lload);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      return wide ? 4 : 2;
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LOOKUPSWITCH.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LOOKUPSWITCH.java
deleted file mode 100644
index 4183168..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LOOKUPSWITCH.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.SwitchInstruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class LOOKUPSWITCH extends SwitchInstruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-
-    out.writeByte(opc_lookupswitch);
-
-    int padding = 3 - (offset % 4);
-    for (int i = 0; i < padding; i++) {
-      out.writeByte(0);
-    }
-
-    for (int i = 0; i < operandsCount(); i++) {
-      out.writeInt(getOperand(i));
-    }
-  }
-
-  public int length() {
-    return 1 + operandsCount() * 4;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LSTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LSTORE.java
deleted file mode 100644
index bed5f7e..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LSTORE.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class LSTORE extends Instruction {
-
-  private static final int[] opcodes = new int[]{opc_lstore_0, opc_lstore_1, opc_lstore_2, opc_lstore_3};
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    int index = getOperand(0);
-    if (index > 3) {
-      if (wide) {
-        out.writeByte(opc_wide);
-      }
-      out.writeByte(opc_lstore);
-      if (wide) {
-        out.writeShort(index);
-      }
-      else {
-        out.writeByte(index);
-      }
-    }
-    else {
-      out.writeByte(opcodes[index]);
-    }
-  }
-
-  public int length() {
-    int index = getOperand(0);
-    if (index > 3) {
-      return wide ? 4 : 2;
-    }
-    else {
-      return 1;
-    }
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/MULTIANEWARRAY.java b/src/org/jetbrains/java/decompiler/code/optinstructions/MULTIANEWARRAY.java
deleted file mode 100644
index b6835e8..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/MULTIANEWARRAY.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class MULTIANEWARRAY extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_multianewarray);
-    out.writeShort(getOperand(0));
-    out.writeByte(getOperand(1));
-  }
-
-  public int length() {
-    return 4;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/NEWARRAY.java b/src/org/jetbrains/java/decompiler/code/optinstructions/NEWARRAY.java
deleted file mode 100644
index f2f8e4d..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/NEWARRAY.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class NEWARRAY extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_newarray);
-    out.writeByte(getOperand(0));
-  }
-
-  public int length() {
-    return 2;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/PUTFIELD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/PUTFIELD.java
deleted file mode 100644
index c1e3e92..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/PUTFIELD.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class PUTFIELD extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_putfield);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/PUTSTATIC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/PUTSTATIC.java
deleted file mode 100644
index 0fe0240..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/PUTSTATIC.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class PUTSTATIC extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_putstatic);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/RET.java b/src/org/jetbrains/java/decompiler/code/optinstructions/RET.java
deleted file mode 100644
index 93f62ff..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/RET.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class RET extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    if (wide) {
-      out.writeByte(opc_wide);
-    }
-    out.writeByte(opc_ret);
-    if (wide) {
-      out.writeShort(getOperand(0));
-    }
-    else {
-      out.writeByte(getOperand(0));
-    }
-  }
-
-  public int length() {
-    return wide ? 4 : 2;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/SIPUSH.java b/src/org/jetbrains/java/decompiler/code/optinstructions/SIPUSH.java
deleted file mode 100644
index 08b10a5..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/SIPUSH.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class SIPUSH extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_sipush);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/TABLESWITCH.java b/src/org/jetbrains/java/decompiler/code/optinstructions/TABLESWITCH.java
deleted file mode 100644
index 0b41ecf..0000000
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/TABLESWITCH.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.code.optinstructions;
-
-import org.jetbrains.java.decompiler.code.SwitchInstruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class TABLESWITCH extends SwitchInstruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-
-    out.writeByte(opc_tableswitch);
-
-    int padding = 3 - (offset % 4);
-    for (int i = 0; i < padding; i++) {
-      out.writeByte(0);
-    }
-
-    for (int i = 0; i < operandsCount(); i++) {
-      out.writeInt(getOperand(i));
-    }
-  }
-
-  public int length() {
-    return 1 + operandsCount() * 4;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/main/AssertProcessor.java b/src/org/jetbrains/java/decompiler/main/AssertProcessor.java
index abb51ce..a5f8d72 100644
--- a/src/org/jetbrains/java/decompiler/main/AssertProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/AssertProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -157,25 +143,42 @@ public class AssertProcessor {
 
   private static boolean replaceAssertion(Statement parent, IfStatement stat, String classname, String key) {
 
+    boolean throwInIf = true;
     Statement ifstat = stat.getIfstat();
     InvocationExprent throwError = isAssertionError(ifstat);
 
     if (throwError == null) {
-      return false;
+      //check else:
+      Statement elsestat = stat.getElsestat();
+      throwError = isAssertionError(elsestat);
+      if (throwError == null) {
+          return false;
+      }
+      else {
+          throwInIf = false;
+      }
     }
 
-    Object[] exprres = getAssertionExprent(stat.getHeadexprent().getCondition().copy(), classname, key);
+
+    Object[] exprres = getAssertionExprent(stat.getHeadexprent().getCondition().copy(), classname, key, throwInIf);
     if (!(Boolean)exprres[1]) {
       return false;
     }
 
-    List<Exprent> lstParams = new ArrayList<Exprent>();
+    List<Exprent> lstParams = new ArrayList<>();
 
     Exprent ascond = null, retcond = null;
-    if (exprres[0] != null) {
-      ascond = new FunctionExprent(FunctionExprent.FUNCTION_BOOL_NOT, (Exprent)exprres[0], throwError.bytecode);
-      retcond = SecondaryFunctionsHelper.propagateBoolNot(ascond);
+    if (throwInIf) {
+      if (exprres[0] != null) {
+        ascond = new FunctionExprent(FunctionExprent.FUNCTION_BOOL_NOT, (Exprent)exprres[0], throwError.bytecode);
+        retcond = SecondaryFunctionsHelper.propagateBoolNot(ascond);
+      }
     }
+    else {
+        ascond =  (Exprent) exprres[0];
+        retcond = ascond;
+    }
+
 
     lstParams.add(retcond == null ? ascond : retcond);
     if (!throwError.getLstParameters().isEmpty()) {
@@ -196,13 +199,18 @@ public class AssertProcessor {
       first.removeSuccessor(stat.getIfEdge());
       first.removeSuccessor(stat.getElseEdge());
 
-      List<Statement> lstStatements = new ArrayList<Statement>();
+      List<Statement> lstStatements = new ArrayList<>();
       if (first.getExprents() != null && !first.getExprents().isEmpty()) {
         lstStatements.add(first);
       }
       lstStatements.add(newstat);
       if (stat.iftype == IfStatement.IFTYPE_IFELSE) {
-        lstStatements.add(stat.getElsestat());
+        if (throwInIf) {
+          lstStatements.add(stat.getElsestat());
+        }
+        else {
+          lstStatements.add(stat.getIfstat());
+        }
       }
 
       SequenceStatement sequence = new SequenceStatement(lstStatements);
@@ -213,10 +221,16 @@ public class AssertProcessor {
                                                              sequence.getStats().get(i), sequence.getStats().get(i + 1)));
       }
 
-      if (stat.iftype == IfStatement.IFTYPE_IFELSE) {
-        Statement ifelse = stat.getElsestat();
+      if (stat.iftype == IfStatement.IFTYPE_IFELSE || !throwInIf) {
+        Statement stmts;
+        if (throwInIf) {
+          stmts = stat.getElsestat();
+        }
+        else {
+          stmts = stat.getIfstat();
+        }
 
-        List<StatEdge> lstSuccs = ifelse.getAllSuccessorEdges();
+        List<StatEdge> lstSuccs = stmts.getAllSuccessorEdges();
         if (!lstSuccs.isEmpty()) {
           StatEdge endedge = lstSuccs.get(0);
           if (endedge.closure == stat) {
@@ -255,16 +269,21 @@ public class AssertProcessor {
     return null;
   }
 
-  private static Object[] getAssertionExprent(Exprent exprent, String classname, String key) {
+  private static Object[] getAssertionExprent(Exprent exprent, String classname, String key, boolean throwInIf) {
 
     if (exprent.type == Exprent.EXPRENT_FUNCTION) {
+      int desiredOperation = FunctionExprent.FUNCTION_CADD;
+      if (!throwInIf) {
+        desiredOperation = FunctionExprent.FUNCTION_COR;
+      }
+
       FunctionExprent fexpr = (FunctionExprent)exprent;
-      if (fexpr.getFuncType() == FunctionExprent.FUNCTION_CADD) {
+      if (fexpr.getFuncType() == desiredOperation) {
 
         for (int i = 0; i < 2; i++) {
           Exprent param = fexpr.getLstOperands().get(i);
 
-          if (isAssertionField(param, classname, key)) {
+          if (isAssertionField(param, classname, key, throwInIf)) {
             return new Object[]{fexpr.getLstOperands().get(1 - i), true};
           }
         }
@@ -272,7 +291,7 @@ public class AssertProcessor {
         for (int i = 0; i < 2; i++) {
           Exprent param = fexpr.getLstOperands().get(i);
 
-          Object[] res = getAssertionExprent(param, classname, key);
+          Object[] res = getAssertionExprent(param, classname, key, throwInIf);
           if ((Boolean)res[1]) {
             if (param != res[0]) {
               fexpr.getLstOperands().set(i, (Exprent)res[0]);
@@ -281,7 +300,7 @@ public class AssertProcessor {
           }
         }
       }
-      else if (isAssertionField(fexpr, classname, key)) {
+      else if (isAssertionField(fexpr, classname, key, throwInIf)) {
         // assert false;
         return new Object[]{null, true};
       }
@@ -290,20 +309,26 @@ public class AssertProcessor {
     return new Object[]{exprent, false};
   }
 
-  private static boolean isAssertionField(Exprent exprent, String classname, String key) {
-
-    if (exprent.type == Exprent.EXPRENT_FUNCTION) {
-      FunctionExprent fparam = (FunctionExprent)exprent;
-      if (fparam.getFuncType() == FunctionExprent.FUNCTION_BOOL_NOT &&
-          fparam.getLstOperands().get(0).type == Exprent.EXPRENT_FIELD) {
-        FieldExprent fdparam = (FieldExprent)fparam.getLstOperands().get(0);
-        if (classname.equals(fdparam.getClassname())
-            && key.equals(InterpreterUtil.makeUniqueKey(fdparam.getName(), fdparam.getDescriptor().descriptorString))) {
-          return true;
+  private static boolean isAssertionField(Exprent exprent, String classname, String key, boolean throwInIf) {
+    if (throwInIf) {
+      if (exprent.type == Exprent.EXPRENT_FUNCTION) {
+        FunctionExprent fparam = (FunctionExprent)exprent;
+        if (fparam.getFuncType() == FunctionExprent.FUNCTION_BOOL_NOT &&
+            fparam.getLstOperands().get(0).type == Exprent.EXPRENT_FIELD) {
+          FieldExprent fdparam = (FieldExprent)fparam.getLstOperands().get(0);
+          return classname.equals(fdparam.getClassname()) &&
+                 key.equals(InterpreterUtil.makeUniqueKey(fdparam.getName(), fdparam.getDescriptor().descriptorString));
         }
       }
+      return false;
+    }
+    else {
+      if (exprent.type == Exprent.EXPRENT_FIELD) {
+        FieldExprent fdparam = (FieldExprent) exprent;
+        return classname.equals(fdparam.getClassname()) &&
+               key.equals(InterpreterUtil.makeUniqueKey(fdparam.getName(), fdparam.getDescriptor().descriptorString));
+      }
+      return false;
     }
-
-    return false;
   }
 }
diff --git a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
index 677f457..41b5a9a 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -37,78 +23,47 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class ClassReference14Processor {
+  private static final ExitExprent BODY_EXPR;
+  private static final ExitExprent HANDLER_EXPR;
 
-  public final ExitExprent bodyexprent;
+  static {
+    InvocationExprent invFor = new InvocationExprent();
+    invFor.setName("forName");
+    invFor.setClassname("java/lang/Class");
+    invFor.setStringDescriptor("(Ljava/lang/String;)Ljava/lang/Class;");
+    invFor.setDescriptor(MethodDescriptor.parseDescriptor("(Ljava/lang/String;)Ljava/lang/Class;"));
+    invFor.setStatic(true);
+    invFor.setLstParameters(Collections.singletonList(new VarExprent(0, VarType.VARTYPE_STRING, null)));
+    BODY_EXPR = new ExitExprent(ExitExprent.EXIT_RETURN, invFor, VarType.VARTYPE_CLASS, null);
 
-  public final ExitExprent handlerexprent;
-
-
-  public ClassReference14Processor() {
-
-    InvocationExprent invfor = new InvocationExprent();
-    invfor.setName("forName");
-    invfor.setClassname("java/lang/Class");
-    invfor.setStringDescriptor("(Ljava/lang/String;)Ljava/lang/Class;");
-    invfor.setDescriptor(MethodDescriptor.parseDescriptor("(Ljava/lang/String;)Ljava/lang/Class;"));
-    invfor.setStatic(true);
-    invfor.setLstParameters(Arrays.asList(new Exprent[]{new VarExprent(0, VarType.VARTYPE_STRING, null)}));
-
-    bodyexprent = new ExitExprent(ExitExprent.EXIT_RETURN,
-                                  invfor,
-                                  VarType.VARTYPE_CLASS, null);
-
-    InvocationExprent constr = new InvocationExprent();
-    constr.setName(CodeConstants.INIT_NAME);
-    constr.setClassname("java/lang/NoClassDefFoundError");
-    constr.setStringDescriptor("()V");
-    constr.setFunctype(InvocationExprent.TYP_INIT);
-    constr.setDescriptor(MethodDescriptor.parseDescriptor("()V"));
-
-    NewExprent newexpr =
-      new NewExprent(new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/NoClassDefFoundError"), new ArrayList<Exprent>(), null);
-    newexpr.setConstructor(constr);
-
-    InvocationExprent invcause = new InvocationExprent();
-    invcause.setName("initCause");
-    invcause.setClassname("java/lang/NoClassDefFoundError");
-    invcause.setStringDescriptor("(Ljava/lang/Throwable;)Ljava/lang/Throwable;");
-    invcause.setDescriptor(MethodDescriptor.parseDescriptor("(Ljava/lang/Throwable;)Ljava/lang/Throwable;"));
-    invcause.setInstance(newexpr);
-    invcause.setLstParameters(
-      Arrays.asList(new Exprent[]{new VarExprent(2, new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/ClassNotFoundException"), null)}));
-
-    handlerexprent = new ExitExprent(ExitExprent.EXIT_THROW,
-                                     invcause,
-                                     null, null);
+    InvocationExprent ctor = new InvocationExprent();
+    ctor.setName(CodeConstants.INIT_NAME);
+    ctor.setClassname("java/lang/NoClassDefFoundError");
+    ctor.setStringDescriptor("()V");
+    ctor.setFunctype(InvocationExprent.TYP_INIT);
+    ctor.setDescriptor(MethodDescriptor.parseDescriptor("()V"));
+    NewExprent newExpr = new NewExprent(new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/NoClassDefFoundError"), new ArrayList<>(), null);
+    newExpr.setConstructor(ctor);
+    InvocationExprent invCause = new InvocationExprent();
+    invCause.setName("initCause");
+    invCause.setClassname("java/lang/NoClassDefFoundError");
+    invCause.setStringDescriptor("(Ljava/lang/Throwable;)Ljava/lang/Throwable;");
+    invCause.setDescriptor(MethodDescriptor.parseDescriptor("(Ljava/lang/Throwable;)Ljava/lang/Throwable;"));
+    invCause.setInstance(newExpr);
+    invCause.setLstParameters(
+      Collections.singletonList(new VarExprent(2, new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/ClassNotFoundException"), null)));
+    HANDLER_EXPR = new ExitExprent(ExitExprent.EXIT_THROW, invCause, null, null);
   }
 
-
-  public void processClassReferences(ClassNode node) {
-
-    ClassWrapper wrapper = node.getWrapper();
-
-    //		int major_version = wrapper.getClassStruct().major_version;
-    //		int minor_version = wrapper.getClassStruct().minor_version;
-    //
-    //		if(major_version > 48 || (major_version == 48 && minor_version > 0)) {
-    //			// version 1.5 or above
-    //			return;
-    //		}
-
-    if (wrapper.getClassStruct().isVersionGE_1_5()) {
-      // version 1.5 or above
-      return;
-    }
-
+  public static void processClassReferences(ClassNode node) {
     // find the synthetic method Class class$(String) if present
-    HashMap<ClassWrapper, MethodWrapper> mapClassMeths = new HashMap<ClassWrapper, MethodWrapper>();
+    Map<ClassWrapper, MethodWrapper> mapClassMeths = new HashMap<>();
     mapClassMethods(node, mapClassMeths);
-
     if (mapClassMeths.isEmpty()) {
       return;
     }
 
-    HashSet<ClassWrapper> setFound = new HashSet<ClassWrapper>();
+    Set<ClassWrapper> setFound = new HashSet<>();
     processClassRec(node, mapClassMeths, setFound);
 
     if (!setFound.isEmpty()) {
@@ -119,29 +74,21 @@ public class ClassReference14Processor {
     }
   }
 
-  private static void processClassRec(ClassNode node,
-                                      final HashMap<ClassWrapper, MethodWrapper> mapClassMeths,
-                                      final HashSet<ClassWrapper> setFound) {
-
-    final ClassWrapper wrapper = node.getWrapper();
+  private static void processClassRec(ClassNode node, Map<ClassWrapper, MethodWrapper> mapClassMeths, Set<? super ClassWrapper> setFound) {
+    ClassWrapper wrapper = node.getWrapper();
 
     // search code
     for (MethodWrapper meth : wrapper.getMethods()) {
-
       RootStatement root = meth.root;
       if (root != null) {
-
         DirectGraph graph = meth.getOrBuildGraph();
-
-        graph.iterateExprents(new DirectGraph.ExprentIterator() {
-          public int processExprent(Exprent exprent) {
-            for (Entry<ClassWrapper, MethodWrapper> ent : mapClassMeths.entrySet()) {
-              if (replaceInvocations(exprent, ent.getKey(), ent.getValue())) {
-                setFound.add(ent.getKey());
-              }
+        graph.iterateExprents(exprent -> {
+          for (Entry<ClassWrapper, MethodWrapper> ent : mapClassMeths.entrySet()) {
+            if (replaceInvocations(exprent, ent.getKey(), ent.getValue())) {
+              setFound.add(ent.getKey());
             }
-            return 0;
           }
+          return 0;
         });
       }
     }
@@ -173,7 +120,7 @@ public class ClassReference14Processor {
     }
   }
 
-  private void mapClassMethods(ClassNode node, Map<ClassWrapper, MethodWrapper> map) {
+  private static void mapClassMethods(ClassNode node, Map<ClassWrapper, MethodWrapper> map) {
     boolean noSynthFlag = DecompilerContext.getOption(IFernflowerPreferences.SYNTHETIC_NOT_SET);
 
     ClassWrapper wrapper = node.getWrapper();
@@ -196,8 +143,8 @@ public class ClassReference14Processor {
             BasicBlockStatement handler = (BasicBlockStatement)cst.getStats().get(1);
 
             if (body.getExprents().size() == 1 && handler.getExprents().size() == 1) {
-              if (bodyexprent.equals(body.getExprents().get(0)) &&
-                  handlerexprent.equals(handler.getExprents().get(0))) {
+              if (BODY_EXPR.equals(body.getExprents().get(0)) &&
+                  HANDLER_EXPR.equals(handler.getExprents().get(0))) {
                 map.put(wrapper, method);
                 break;
               }
@@ -213,13 +160,10 @@ public class ClassReference14Processor {
     }
   }
 
-
   private static boolean replaceInvocations(Exprent exprent, ClassWrapper wrapper, MethodWrapper meth) {
-
     boolean res = false;
 
     while (true) {
-
       boolean found = false;
 
       for (Exprent expr : exprent.getAllExprents()) {
@@ -242,9 +186,7 @@ public class ClassReference14Processor {
     return res;
   }
 
-
   private static String isClass14Invocation(Exprent exprent, ClassWrapper wrapper, MethodWrapper meth) {
-
     if (exprent.type == Exprent.EXPRENT_FUNCTION) {
       FunctionExprent fexpr = (FunctionExprent)exprent;
       if (fexpr.getFuncType() == FunctionExprent.FUNCTION_IIF) {
@@ -293,4 +235,4 @@ public class ClassReference14Processor {
 
     return null;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
index 585ff5a..72fefe4 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassWriter.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -23,10 +9,7 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarTypeProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
@@ -42,27 +25,27 @@ import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.struct.gen.generics.*;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.*;
 
 public class ClassWriter {
-
-  private final ClassReference14Processor ref14processor;
   private final PoolInterceptor interceptor;
 
   public ClassWriter() {
-    ref14processor = new ClassReference14Processor();
     interceptor = DecompilerContext.getPoolInterceptor();
   }
 
-  private void invokeProcessors(ClassNode node) {
+  private static void invokeProcessors(ClassNode node) {
     ClassWrapper wrapper = node.getWrapper();
     StructClass cl = wrapper.getClassStruct();
 
     InitializerProcessor.extractInitializers(wrapper);
 
-    if (node.type == ClassNode.CLASS_ROOT && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_CLASS_1_4)) {
-      ref14processor.processClassReferences(node);
+    if (node.type == ClassNode.CLASS_ROOT &&
+        !cl.isVersionGE_1_5() &&
+        DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_CLASS_1_4)) {
+      ClassReference14Processor.processClassReferences(node);
     }
 
     if (cl.hasModifier(CodeConstants.ACC_ENUM) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM)) {
@@ -99,11 +82,11 @@ public class ClassWriter {
         }
         else {
           // reference to a static method
-          buffer.append(ExprProcessor.getCastTypeName(new VarType(node.lambdaInformation.content_class_name, false)));
+          buffer.append(ExprProcessor.getCastTypeName(new VarType(node.lambdaInformation.content_class_name, true)));
         }
 
-        buffer.append("::");
-        buffer.append(node.lambdaInformation.content_method_name);
+        buffer.append("::")
+          .append(CodeConstants.INIT_NAME.equals(node.lambdaInformation.content_method_name) ? "new" : node.lambdaInformation.content_method_name);
       }
       else {
         // lambda method
@@ -154,15 +137,6 @@ public class ClassWriter {
     DecompilerContext.getLogger().endWriteClass();
   }
 
-  private static void addTracer(StructClass cls, StructMethod method, BytecodeMappingTracer tracer) {
-    StructLineNumberTableAttribute lineNumberTable =
-      (StructLineNumberTableAttribute)method.getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_LINE_NUMBER_TABLE);
-    tracer.setLineNumberTable(lineNumberTable);
-    DecompilerContext.getBytecodeSourceMapper().addTracer(cls.qualifiedName,
-                                                          InterpreterUtil.makeUniqueKey(method.getName(), method.getDescriptor()),
-                                                          tracer);
-  }
-
   public void classToJava(ClassNode node, TextBuffer buffer, int indent, BytecodeMappingTracer tracer) {
     ClassNode outerNode = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE);
     DecompilerContext.setProperty(DecompilerContext.CURRENT_CLASS_NODE, node);
@@ -183,12 +157,7 @@ public class ClassWriter {
       int start_class_def = buffer.length();
       writeClassDefinition(node, buffer, indent);
 
-//      // count lines in class definition the easiest way
-//      startLine = buffer.substring(start_class_def).toString().split(lineSeparator, -1).length - 1;
-
       boolean hasContent = false;
-
-      // fields
       boolean enumFields = false;
 
       dummy_tracer.incrementCurrentSourceLine(buffer.countLines(start_class_def));
@@ -257,7 +226,7 @@ public class ClassWriter {
       for (ClassNode inner : node.nested) {
         if (inner.type == ClassNode.CLASS_MEMBER) {
           StructClass innerCl = inner.classStruct;
-          boolean isSynthetic = (inner.access & CodeConstants.ACC_SYNTHETIC) != 0 || innerCl.isSynthetic() || inner.namelessConstructorStub;
+          boolean isSynthetic = (inner.access & CodeConstants.ACC_SYNTHETIC) != 0 || innerCl.isSynthetic();
           boolean hide = isSynthetic && DecompilerContext.getOption(IFernflowerPreferences.REMOVE_SYNTHETIC) ||
                          wrapper.getHiddenMembers().contains(innerCl.qualifiedName);
           if (hide) continue;
@@ -287,6 +256,13 @@ public class ClassWriter {
     DecompilerContext.getLogger().endWriteClass();
   }
 
+  private static void addTracer(StructClass cls, StructMethod method, BytecodeMappingTracer tracer) {
+    StructLineNumberTableAttribute table = method.getAttribute(StructGeneralAttribute.ATTRIBUTE_LINE_NUMBER_TABLE);
+    tracer.setLineNumberTable(table);
+    String key = InterpreterUtil.makeUniqueKey(method.getName(), method.getDescriptor());
+    DecompilerContext.getBytecodeSourceMapper().addTracer(cls.qualifiedName, key, tracer);
+  }
+
   private void writeClassDefinition(ClassNode node, TextBuffer buffer, int indent) {
     if (node.type == ClassNode.CLASS_ANONYMOUS) {
       buffer.append(" {").appendLineSeparator();
@@ -297,8 +273,8 @@ public class ClassWriter {
     StructClass cl = wrapper.getClassStruct();
 
     int flags = node.type == ClassNode.CLASS_ROOT ? cl.getAccessFlags() : node.access;
-    boolean isDeprecated = cl.getAttributes().containsKey("Deprecated");
-    boolean isSynthetic = (flags & CodeConstants.ACC_SYNTHETIC) != 0 || cl.getAttributes().containsKey("Synthetic");
+    boolean isDeprecated = cl.hasAttribute(StructGeneralAttribute.ATTRIBUTE_DEPRECATED);
+    boolean isSynthetic = (flags & CodeConstants.ACC_SYNTHETIC) != 0 || cl.hasAttribute(StructGeneralAttribute.ATTRIBUTE_SYNTHETIC);
     boolean isEnum = DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM) && (flags & CodeConstants.ACC_ENUM) != 0;
     boolean isInterface = (flags & CodeConstants.ACC_INTERFACE) != 0;
     boolean isAnnotation = (flags & CodeConstants.ACC_ANNOTATION) != 0;
@@ -316,7 +292,7 @@ public class ClassWriter {
       appendComment(buffer, "synthetic class", indent);
     }
 
-    appendAnnotations(buffer, cl, indent);
+    appendAnnotations(buffer, indent, cl, -1);
 
     buffer.appendIndent(indent);
 
@@ -341,16 +317,9 @@ public class ClassWriter {
       buffer.append("class ");
     }
 
-    GenericClassDescriptor descriptor = null;
-    if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-      StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)cl.getAttributes().getWithKey("Signature");
-      if (attr != null) {
-        descriptor = GenericMain.parseClassSignature(attr.getSignature());
-      }
-    }
-
     buffer.append(node.simpleName);
 
+    GenericClassDescriptor descriptor = getGenericClassDescriptor(cl);
     if (descriptor != null && !descriptor.fparameters.isEmpty()) {
       appendTypeParameters(buffer, descriptor.fparameters, descriptor.fbounds);
     }
@@ -396,7 +365,7 @@ public class ClassWriter {
   private void fieldToJava(ClassWrapper wrapper, StructClass cl, StructField fd, TextBuffer buffer, int indent, BytecodeMappingTracer tracer) {
     int start = buffer.length();
     boolean isInterface = cl.hasModifier(CodeConstants.ACC_INTERFACE);
-    boolean isDeprecated = fd.getAttributes().containsKey("Deprecated");
+    boolean isDeprecated = fd.hasAttribute(StructGeneralAttribute.ATTRIBUTE_DEPRECATED);
     boolean isEnum = fd.hasModifier(CodeConstants.ACC_ENUM) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM);
 
     if (isDeprecated) {
@@ -412,7 +381,7 @@ public class ClassWriter {
       appendComment(buffer, "synthetic field", indent);
     }
 
-    appendAnnotations(buffer, fd, indent);
+    appendAnnotations(buffer, indent, fd, TypeAnnotation.FIELD);
 
     buffer.appendIndent(indent);
 
@@ -424,7 +393,7 @@ public class ClassWriter {
 
     GenericFieldDescriptor descriptor = null;
     if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-      StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)fd.getAttributes().getWithKey("Signature");
+      StructGenericSignatureAttribute attr = fd.getAttribute(StructGeneralAttribute.ATTRIBUTE_SIGNATURE);
       if (attr != null) {
         descriptor = GenericMain.parseFieldSignature(attr.getSignature());
       }
@@ -453,9 +422,9 @@ public class ClassWriter {
     }
     if (initializer != null) {
       if (isEnum && initializer.type == Exprent.EXPRENT_NEW) {
-        NewExprent nexpr = (NewExprent)initializer;
-        nexpr.setEnumConst(true);
-        buffer.append(nexpr.toJava(indent, tracer));
+        NewExprent expr = (NewExprent)initializer;
+        expr.setEnumConst(true);
+        buffer.append(expr.toJava(indent, tracer));
       }
       else {
         buffer.append(" = ");
@@ -464,13 +433,12 @@ public class ClassWriter {
           ((ConstExprent) initializer).adjustConstType(fieldType);
         }
 
-        // FIXME: special case field initializer. Can map to more than one method (constructor) and bytecode intruction.
+        // FIXME: special case field initializer. Can map to more than one method (constructor) and bytecode instruction
         buffer.append(initializer.toJava(indent, tracer));
       }
     }
     else if (fd.hasModifier(CodeConstants.ACC_FINAL) && fd.hasModifier(CodeConstants.ACC_STATIC)) {
-      StructConstantValueAttribute attr =
-        (StructConstantValueAttribute)fd.getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_CONSTANT_VALUE);
+      StructConstantValueAttribute attr = fd.getAttribute(StructGeneralAttribute.ATTRIBUTE_CONSTANT_VALUE);
       if (attr != null) {
         PrimitiveConstant constant = cl.getPool().getPrimitiveConstant(attr.getIndex());
         buffer.append(" = ");
@@ -545,8 +513,9 @@ public class ClassWriter {
           try {
             buffer.append(root.toJava(indent, tracer));
           }
-          catch (Throwable ex) {
-            DecompilerContext.getLogger().writeMessage("Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be written.", ex);
+          catch (Throwable t) {
+            String message = "Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be written.";
+            DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN, t);
             methodWrapper.decompiledWithErrors = true;
           }
         }
@@ -572,7 +541,7 @@ public class ClassWriter {
     }
   }
 
-  public static String toValidJavaIdentifier(String name) {
+  private static String toValidJavaIdentifier(String name) {
     if (name == null || name.isEmpty()) return name;
 
     boolean changed = false;
@@ -584,7 +553,9 @@ public class ClassWriter {
         changed = true;
         res.append("_");
       }
-      else res.append(c);
+      else {
+        res.append(c);
+      }
     }
     if (!changed) {
       return name;
@@ -607,7 +578,7 @@ public class ClassWriter {
       boolean isInterface = cl.hasModifier(CodeConstants.ACC_INTERFACE);
       boolean isAnnotation = cl.hasModifier(CodeConstants.ACC_ANNOTATION);
       boolean isEnum = cl.hasModifier(CodeConstants.ACC_ENUM) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM);
-      boolean isDeprecated = mt.getAttributes().containsKey("Deprecated");
+      boolean isDeprecated = mt.hasAttribute(StructGeneralAttribute.ATTRIBUTE_DEPRECATED);
       boolean clinit = false, init = false, dinit = false;
 
       MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
@@ -629,7 +600,7 @@ public class ClassWriter {
         appendRenameComment(buffer, oldName, MType.METHOD, indent);
       }
 
-      boolean isSynthetic = (flags & CodeConstants.ACC_SYNTHETIC) != 0 || mt.getAttributes().containsKey("Synthetic");
+      boolean isSynthetic = (flags & CodeConstants.ACC_SYNTHETIC) != 0 || mt.hasAttribute(StructGeneralAttribute.ATTRIBUTE_SYNTHETIC);
       boolean isBridge = (flags & CodeConstants.ACC_BRIDGE) != 0;
       if (isSynthetic) {
         appendComment(buffer, "synthetic method", indent);
@@ -638,13 +609,13 @@ public class ClassWriter {
         appendComment(buffer, "bridge method", indent);
       }
 
-      appendAnnotations(buffer, mt, indent);
+      appendAnnotations(buffer, indent, mt, TypeAnnotation.METHOD_RETURN_TYPE);
 
       buffer.appendIndent(indent);
 
       appendModifiers(buffer, flags, METHOD_ALLOWED, isInterface, METHOD_EXCLUDED);
 
-      if (isInterface && mt.containsCode()) {
+      if (isInterface && !mt.hasModifier(CodeConstants.ACC_STATIC) && mt.containsCode()) {
         // 'default' modifier (Java 8)
         buffer.append("default ");
       }
@@ -667,22 +638,19 @@ public class ClassWriter {
 
       GenericMethodDescriptor descriptor = null;
       if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
-        StructGenericSignatureAttribute attr = (StructGenericSignatureAttribute)mt.getAttributes().getWithKey("Signature");
+        StructGenericSignatureAttribute attr = mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_SIGNATURE);
         if (attr != null) {
           descriptor = GenericMain.parseMethodSignature(attr.getSignature());
           if (descriptor != null) {
-            int actualParams = md.params.length;
-            List<VarVersionPair> sigFields = methodWrapper.signatureFields;
-            if (sigFields != null) {
-               actualParams = 0;
-              for (VarVersionPair field : methodWrapper.signatureFields) {
-                if (field == null) {
-                  actualParams++;
-                }
-              }
+            long actualParams = md.params.length;
+            List<VarVersionPair> mask = methodWrapper.synthParameters;
+            if (mask != null) {
+              actualParams = mask.stream().filter(Objects::isNull).count();
             }
-            else if (isEnum && init) actualParams -= 2;
-            if (actualParams != descriptor.params.size()) {
+            else if (isEnum && init) {
+              actualParams -= 2;
+            }
+            if (actualParams != descriptor.parameterTypes.size()) {
               String message = "Inconsistent generic signature in method " + mt.getName() + " " + mt.getDescriptor() + " in " + cl.qualifiedName;
               DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
               descriptor = null;
@@ -697,14 +665,14 @@ public class ClassWriter {
       if (!clinit && !dinit) {
         boolean thisVar = !mt.hasModifier(CodeConstants.ACC_STATIC);
 
-        if (descriptor != null && !descriptor.fparameters.isEmpty()) {
-          appendTypeParameters(buffer, descriptor.fparameters, descriptor.fbounds);
+        if (descriptor != null && !descriptor.typeParameters.isEmpty()) {
+          appendTypeParameters(buffer, descriptor.typeParameters, descriptor.typeParameterBounds);
           buffer.append(' ');
         }
 
         if (!init) {
           if (descriptor != null) {
-            buffer.append(GenericMain.getGenericCastTypeName(descriptor.ret));
+            buffer.append(GenericMain.getGenericCastTypeName(descriptor.returnType));
           }
           else {
             buffer.append(ExprProcessor.getCastTypeName(md.ret));
@@ -715,79 +683,80 @@ public class ClassWriter {
         buffer.append(toValidJavaIdentifier(name));
         buffer.append('(');
 
-        // parameters
-        List<VarVersionPair> signFields = methodWrapper.signatureFields;
+        List<VarVersionPair> mask = methodWrapper.synthParameters;
 
         int lastVisibleParameterIndex = -1;
         for (int i = 0; i < md.params.length; i++) {
-          if (signFields == null || signFields.get(i) == null) {
+          if (mask == null || mask.get(i) == null) {
             lastVisibleParameterIndex = i;
           }
         }
 
-        boolean firstParameter = true;
+        List<StructMethodParametersAttribute.Entry> methodParameters = null;
+        if (DecompilerContext.getOption(IFernflowerPreferences.USE_METHOD_PARAMETERS)) {
+          StructMethodParametersAttribute attr = mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_METHOD_PARAMETERS);
+          if (attr != null) {
+            methodParameters = attr.getEntries();
+          }
+        }
+
         int index = isEnum && init ? 3 : thisVar ? 1 : 0;
-        boolean hasDescriptor = descriptor != null;
-        int start = isEnum && init && !hasDescriptor ? 2 : 0;
-        int params = hasDescriptor ? descriptor.params.size() : md.params.length;
-        for (int i = start; i < params; i++) {
-          if (hasDescriptor || (signFields == null || signFields.get(i) == null)) {
-            if (!firstParameter) {
+        int start = isEnum && init ? 2 : 0;
+        for (int i = start; i < md.params.length; i++) {
+          if (mask == null || mask.get(i) == null) {
+            if (paramCount > 0) {
               buffer.append(", ");
             }
 
             appendParameterAnnotations(buffer, mt, paramCount);
 
-            if (methodWrapper.varproc.getVarFinal(new VarVersionPair(index, 0)) == VarTypeProcessor.VAR_EXPLICIT_FINAL) {
+            if (methodParameters != null && i < methodParameters.size()) {
+              appendModifiers(buffer, methodParameters.get(i).myAccessFlags, CodeConstants.ACC_FINAL, isInterface, 0);
+            }
+            else if (methodWrapper.varproc.getVarFinal(new VarVersionPair(index, 0)) == VarTypeProcessor.VAR_EXPLICIT_FINAL) {
               buffer.append("final ");
             }
 
-            if (descriptor != null) {
-              GenericType parameterType = descriptor.params.get(i);
+            String typeName;
+            boolean isVarArg = i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS);
 
-              boolean isVarArg = (i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS) && parameterType.arrayDim > 0);
+            if (descriptor != null) {
+              GenericType parameterType = descriptor.parameterTypes.get(paramCount);
+              isVarArg &= parameterType.arrayDim > 0;
               if (isVarArg) {
                 parameterType = parameterType.decreaseArrayDim();
               }
-
-              String typeName = GenericMain.getGenericCastTypeName(parameterType);
-              if (ExprProcessor.UNDEFINED_TYPE_STRING.equals(typeName) &&
-                  DecompilerContext.getOption(IFernflowerPreferences.UNDEFINED_PARAM_TYPE_OBJECT)) {
-                typeName = ExprProcessor.getCastTypeName(VarType.VARTYPE_OBJECT);
-              }
-
-              buffer.append(typeName);
-
-              if (isVarArg) {
-                buffer.append("...");
-              }
+              typeName = GenericMain.getGenericCastTypeName(parameterType);
             }
             else {
               VarType parameterType = md.params[i];
-
-              boolean isVarArg = (i == lastVisibleParameterIndex && mt.hasModifier(CodeConstants.ACC_VARARGS) && parameterType.arrayDim > 0);
+              isVarArg &= parameterType.arrayDim > 0;
               if (isVarArg) {
                 parameterType = parameterType.decreaseArrayDim();
               }
+              typeName = ExprProcessor.getCastTypeName(parameterType);
+            }
 
-              String typeName = ExprProcessor.getCastTypeName(parameterType);
-              if (ExprProcessor.UNDEFINED_TYPE_STRING.equals(typeName) &&
-                  DecompilerContext.getOption(IFernflowerPreferences.UNDEFINED_PARAM_TYPE_OBJECT)) {
-                typeName = ExprProcessor.getCastTypeName(VarType.VARTYPE_OBJECT);
-              }
-
-              buffer.append(typeName);
-
-              if (isVarArg) {
-                buffer.append("...");
-              }
+            if (ExprProcessor.UNDEFINED_TYPE_STRING.equals(typeName) &&
+                DecompilerContext.getOption(IFernflowerPreferences.UNDEFINED_PARAM_TYPE_OBJECT)) {
+              typeName = ExprProcessor.getCastTypeName(VarType.VARTYPE_OBJECT);
+            }
+            buffer.append(typeName);
+            if (isVarArg) {
+              buffer.append("...");
             }
 
             buffer.append(' ');
-            String parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));
+
+            String parameterName;
+            if (methodParameters != null && i < methodParameters.size()) {
+              parameterName = methodParameters.get(i).myName;
+            }
+            else {
+              parameterName = methodWrapper.varproc.getVarName(new VarVersionPair(index, 0));
+            }
             buffer.append(parameterName == null ? "param" + index : parameterName); // null iff decompiled with errors
 
-            firstParameter = false;
             paramCount++;
           }
 
@@ -796,8 +765,8 @@ public class ClassWriter {
 
         buffer.append(')');
 
-        StructExceptionsAttribute attr = (StructExceptionsAttribute)mt.getAttributes().getWithKey("Exceptions");
-        if ((descriptor != null && !descriptor.exceptions.isEmpty()) || attr != null) {
+        StructExceptionsAttribute attr = mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_EXCEPTIONS);
+        if ((descriptor != null && !descriptor.exceptionTypes.isEmpty()) || attr != null) {
           throwsExceptions = true;
           buffer.append(" throws ");
 
@@ -805,8 +774,8 @@ public class ClassWriter {
             if (i > 0) {
               buffer.append(", ");
             }
-            if (descriptor != null && !descriptor.exceptions.isEmpty()) {
-              GenericType type = descriptor.exceptions.get(i);
+            if (descriptor != null && !descriptor.exceptionTypes.isEmpty()) {
+              GenericType type = descriptor.exceptionTypes.get(i);
               buffer.append(GenericMain.getGenericCastTypeName(type));
             }
             else {
@@ -821,16 +790,15 @@ public class ClassWriter {
 
       if ((flags & (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_NATIVE)) != 0) { // native or abstract method (explicit or interface)
         if (isAnnotation) {
-          StructAnnDefaultAttribute attr = (StructAnnDefaultAttribute)mt.getAttributes().getWithKey("AnnotationDefault");
+          StructAnnDefaultAttribute attr = mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_ANNOTATION_DEFAULT);
           if (attr != null) {
             buffer.append(" default ");
-            buffer.append(attr.getDefaultValue().toJava(indent + 1, new BytecodeMappingTracer())); // dummy tracer
+            buffer.append(attr.getDefaultValue().toJava(0, BytecodeMappingTracer.DUMMY));
           }
         }
 
         buffer.append(';');
         buffer.appendLineSeparator();
-        tracer.incrementCurrentSourceLine();
       }
       else {
         if (!clinit && !dinit) {
@@ -838,11 +806,6 @@ public class ClassWriter {
         }
 
         // We do not have line information for method start, lets have it here for now
-        StructLineNumberTableAttribute lineNumberTable =
-          (StructLineNumberTableAttribute)mt.getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_LINE_NUMBER_TABLE);
-        if (lineNumberTable != null && DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_LINE_NUMBERS)) {
-          buffer.setCurrentLine(lineNumberTable.getFirstLine() - 1);
-        }
         buffer.append('{').appendLineSeparator();
         tracer.incrementCurrentSourceLine();
 
@@ -850,20 +813,20 @@ public class ClassWriter {
 
         if (root != null && !methodWrapper.decompiledWithErrors) { // check for existence
           try {
-            int startLine = tracer.getCurrentSourceLine();
+            // to restore in case of an exception
+            BytecodeMappingTracer codeTracer = new BytecodeMappingTracer(tracer.getCurrentSourceLine());
+            TextBuffer code = root.toJava(indent + 1, codeTracer);
 
-            TextBuffer code = root.toJava(indent + 1, tracer);
-
-            hideMethod = (clinit || dinit || hideConstructor(wrapper, init, throwsExceptions, paramCount)) && code.length() == 0;
-
-            if (!hideMethod && lineNumberTable != null && DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_LINE_NUMBERS)) {
-              mapLines(code, lineNumberTable, tracer, startLine);
-            }
+            hideMethod = (code.length() == 0) && (clinit || dinit || hideConstructor(node, init, throwsExceptions, paramCount, flags));
 
             buffer.append(code);
+
+            tracer.setCurrentSourceLine(codeTracer.getCurrentSourceLine());
+            tracer.addTracer(codeTracer);
           }
-          catch (Throwable ex) {
-            DecompilerContext.getLogger().writeMessage("Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be written.", ex);
+          catch (Throwable t) {
+            String message = "Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be written.";
+            DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN, t);
             methodWrapper.decompiledWithErrors = true;
           }
         }
@@ -874,13 +837,13 @@ public class ClassWriter {
           buffer.appendLineSeparator();
           tracer.incrementCurrentSourceLine();
         }
-
-        if (root != null) {
+        else if (root != null) {
           tracer.addMapping(root.getDummyExit().bytecode);
         }
         buffer.appendIndent(indent).append('}').appendLineSeparator();
-        tracer.incrementCurrentSourceLine();
       }
+
+      tracer.incrementCurrentSourceLine();
     }
     finally {
       DecompilerContext.setProperty(DecompilerContext.CURRENT_METHOD_WRAPPER, outerWrapper);
@@ -893,45 +856,25 @@ public class ClassWriter {
     return !hideMethod;
   }
 
-  private static void mapLines(TextBuffer code, StructLineNumberTableAttribute table, BytecodeMappingTracer tracer, int startLine) {
-    // build line start offsets map
-    HashMap<Integer, Set<Integer>> lineStartOffsets = new HashMap<Integer, Set<Integer>>();
-    for (Map.Entry<Integer, Integer> entry : tracer.getMapping().entrySet()) {
-      Integer lineNumber = entry.getValue() - startLine;
-      Set<Integer> curr = lineStartOffsets.get(lineNumber);
-      if (curr == null) {
-        curr = new TreeSet<Integer>(); // requires natural sorting!
-      }
-      curr.add(entry.getKey());
-      lineStartOffsets.put(lineNumber, curr);
-    }
-    String lineSeparator = DecompilerContext.getNewLineSeparator();
-    StringBuilder text = code.getOriginalText();
-    int pos = text.indexOf(lineSeparator);
-    int lineNumber = 0;
-    while (pos != -1) {
-      Set<Integer> startOffsets = lineStartOffsets.get(lineNumber);
-      if (startOffsets != null) {
-        for (Integer offset : startOffsets) {
-          int number = table.findLineNumber(offset);
-          if (number >= 0) {
-            code.setLineMapping(number, pos);
-            break;
-          }
-        }
-      }
-      pos = text.indexOf(lineSeparator, pos+1);
-      lineNumber++;
-    }
-  }
+  private static boolean hideConstructor(ClassNode node, boolean init, boolean throwsExceptions, int paramCount, int methodAccessFlags) {
 
-  private static boolean hideConstructor(ClassWrapper wrapper, boolean init, boolean throwsExceptions, int paramCount) {
     if (!init || throwsExceptions || paramCount > 0 || !DecompilerContext.getOption(IFernflowerPreferences.HIDE_DEFAULT_CONSTRUCTOR)) {
       return false;
     }
 
+    ClassWrapper wrapper = node.getWrapper();
+	  StructClass cl = wrapper.getClassStruct();
+
+	  int classAccesFlags = node.type == ClassNode.CLASS_ROOT ? cl.getAccessFlags() : node.access;
+    boolean isEnum = cl.hasModifier(CodeConstants.ACC_ENUM) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM);
+
+    // default constructor requires same accessibility flags. Exception: enum constructor which is always private
+  	if(!isEnum && ((classAccesFlags & ACCESSIBILITY_FLAGS) != (methodAccessFlags & ACCESSIBILITY_FLAGS))) {
+  	  return false;
+  	}
+
     int count = 0;
-    for (StructMethod mt : wrapper.getClassStruct().getMethods()) {
+    for (StructMethod mt : cl.getMethods()) {
       if (CodeConstants.INIT_NAME.equals(mt.getName())) {
         if (++count > 1) {
           return false;
@@ -1000,56 +943,87 @@ public class ClassWriter {
     buffer.appendIndent(indent).append("// $FF: ").append(comment).appendLineSeparator();
   }
 
-  private static final String[] ANNOTATION_ATTRIBUTES = {
+  private static final StructGeneralAttribute.Key[] ANNOTATION_ATTRIBUTES = {
     StructGeneralAttribute.ATTRIBUTE_RUNTIME_VISIBLE_ANNOTATIONS, StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS};
+  private static final StructGeneralAttribute.Key[] PARAMETER_ANNOTATION_ATTRIBUTES = {
+    StructGeneralAttribute.ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS, StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS};
+  private static final StructGeneralAttribute.Key[] TYPE_ANNOTATION_ATTRIBUTES = {
+    StructGeneralAttribute.ATTRIBUTE_RUNTIME_VISIBLE_TYPE_ANNOTATIONS, StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS};
 
-  private static void appendAnnotations(TextBuffer buffer, StructMember mb, int indent) {
+  private static void appendAnnotations(TextBuffer buffer, int indent, StructMember mb, int targetType) {
+    Set<String> filter = new HashSet<>();
 
-    BytecodeMappingTracer tracer_dummy = new BytecodeMappingTracer(); // FIXME: replace with a real one
-
-    for (String name : ANNOTATION_ATTRIBUTES) {
-      StructAnnotationAttribute attribute = (StructAnnotationAttribute)mb.getAttributes().getWithKey(name);
+    for (StructGeneralAttribute.Key<?> key : ANNOTATION_ATTRIBUTES) {
+      StructAnnotationAttribute attribute = (StructAnnotationAttribute)mb.getAttribute(key);
       if (attribute != null) {
         for (AnnotationExprent annotation : attribute.getAnnotations()) {
-          buffer.append(annotation.toJava(indent, tracer_dummy)).appendLineSeparator();
+          String text = annotation.toJava(indent, BytecodeMappingTracer.DUMMY).toString();
+          filter.add(text);
+          buffer.append(text).appendLineSeparator();
         }
       }
     }
+
+    appendTypeAnnotations(buffer, indent, mb, targetType, -1, filter);
   }
 
-  private static final String[] PARAMETER_ANNOTATION_ATTRIBUTES = {
-    StructGeneralAttribute.ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS, StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS};
-
   private static void appendParameterAnnotations(TextBuffer buffer, StructMethod mt, int param) {
+    Set<String> filter = new HashSet<>();
 
-    BytecodeMappingTracer tracer_dummy = new BytecodeMappingTracer(); // FIXME: replace with a real one
-
-    for (String name : PARAMETER_ANNOTATION_ATTRIBUTES) {
-      StructAnnotationParameterAttribute attribute = (StructAnnotationParameterAttribute)mt.getAttributes().getWithKey(name);
+    for (StructGeneralAttribute.Key<?> key : PARAMETER_ANNOTATION_ATTRIBUTES) {
+      StructAnnotationParameterAttribute attribute = (StructAnnotationParameterAttribute)mt.getAttribute(key);
       if (attribute != null) {
         List<List<AnnotationExprent>> annotations = attribute.getParamAnnotations();
         if (param < annotations.size()) {
           for (AnnotationExprent annotation : annotations.get(param)) {
-            buffer.append(annotation.toJava(0, tracer_dummy)).append(' ');
+            String text = annotation.toJava(-1, BytecodeMappingTracer.DUMMY).toString();
+            filter.add(text);
+            buffer.append(text).append(' ');
+          }
+        }
+      }
+    }
+
+    appendTypeAnnotations(buffer, -1, mt, TypeAnnotation.METHOD_PARAMETER, param, filter);
+  }
+
+  private static void appendTypeAnnotations(TextBuffer buffer, int indent, StructMember mb, int targetType, int index, Set<String> filter) {
+    for (StructGeneralAttribute.Key<?> key : TYPE_ANNOTATION_ATTRIBUTES) {
+      StructTypeAnnotationAttribute attribute = (StructTypeAnnotationAttribute)mb.getAttribute(key);
+      if (attribute != null) {
+        for (TypeAnnotation annotation : attribute.getAnnotations()) {
+          if (annotation.isTopLevel() && annotation.getTargetType() == targetType && (index < 0 || annotation.getIndex() == index)) {
+            String text = annotation.getAnnotation().toJava(indent, BytecodeMappingTracer.DUMMY).toString();
+            if (!filter.contains(text)) {
+              buffer.append(text);
+              if (indent < 0) {
+                buffer.append(' ');
+              }
+              else {
+                buffer.appendLineSeparator();
+              }
+            }
           }
         }
       }
     }
   }
 
-  private static final Map<Integer, String> MODIFIERS = new LinkedHashMap<Integer, String>() {{
-    put(CodeConstants.ACC_PUBLIC, "public");
-    put(CodeConstants.ACC_PROTECTED, "protected");
-    put(CodeConstants.ACC_PRIVATE, "private");
-    put(CodeConstants.ACC_ABSTRACT, "abstract");
-    put(CodeConstants.ACC_STATIC, "static");
-    put(CodeConstants.ACC_FINAL, "final");
-    put(CodeConstants.ACC_STRICT, "strictfp");
-    put(CodeConstants.ACC_TRANSIENT, "transient");
-    put(CodeConstants.ACC_VOLATILE, "volatile");
-    put(CodeConstants.ACC_SYNCHRONIZED, "synchronized");
-    put(CodeConstants.ACC_NATIVE, "native");
-  }};
+  private static final Map<Integer, String> MODIFIERS;
+  static {
+    MODIFIERS = new LinkedHashMap<>();
+    MODIFIERS.put(CodeConstants.ACC_PUBLIC, "public");
+    MODIFIERS.put(CodeConstants.ACC_PROTECTED, "protected");
+    MODIFIERS.put(CodeConstants.ACC_PRIVATE, "private");
+    MODIFIERS.put(CodeConstants.ACC_ABSTRACT, "abstract");
+    MODIFIERS.put(CodeConstants.ACC_STATIC, "static");
+    MODIFIERS.put(CodeConstants.ACC_FINAL, "final");
+    MODIFIERS.put(CodeConstants.ACC_STRICT, "strictfp");
+    MODIFIERS.put(CodeConstants.ACC_TRANSIENT, "transient");
+    MODIFIERS.put(CodeConstants.ACC_VOLATILE, "volatile");
+    MODIFIERS.put(CodeConstants.ACC_SYNCHRONIZED, "synchronized");
+    MODIFIERS.put(CodeConstants.ACC_NATIVE, "native");
+  }
 
   private static final int CLASS_ALLOWED =
     CodeConstants.ACC_PUBLIC | CodeConstants.ACC_PROTECTED | CodeConstants.ACC_PRIVATE | CodeConstants.ACC_ABSTRACT |
@@ -1059,12 +1033,15 @@ public class ClassWriter {
     CodeConstants.ACC_FINAL | CodeConstants.ACC_TRANSIENT | CodeConstants.ACC_VOLATILE;
   private static final int METHOD_ALLOWED =
     CodeConstants.ACC_PUBLIC | CodeConstants.ACC_PROTECTED | CodeConstants.ACC_PRIVATE | CodeConstants.ACC_ABSTRACT |
-    CodeConstants.ACC_STATIC | CodeConstants.ACC_FINAL | CodeConstants.ACC_SYNCHRONIZED | CodeConstants.ACC_NATIVE | CodeConstants.ACC_STRICT;
+    CodeConstants.ACC_STATIC | CodeConstants.ACC_FINAL | CodeConstants.ACC_SYNCHRONIZED | CodeConstants.ACC_NATIVE |
+    CodeConstants.ACC_STRICT;
 
   private static final int CLASS_EXCLUDED = CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_STATIC;
   private static final int FIELD_EXCLUDED = CodeConstants.ACC_PUBLIC | CodeConstants.ACC_STATIC | CodeConstants.ACC_FINAL;
   private static final int METHOD_EXCLUDED = CodeConstants.ACC_PUBLIC | CodeConstants.ACC_ABSTRACT;
 
+  private static final int ACCESSIBILITY_FLAGS = CodeConstants.ACC_PUBLIC | CodeConstants.ACC_PROTECTED | CodeConstants.ACC_PRIVATE;
+
   private static void appendModifiers(TextBuffer buffer, int flags, int allowed, boolean isInterface, int excluded) {
     flags &= allowed;
     if (!isInterface) excluded = 0;
@@ -1075,7 +1052,17 @@ public class ClassWriter {
     }
   }
 
-  private static void appendTypeParameters(TextBuffer buffer, List<String> parameters, List<List<GenericType>> bounds) {
+  public static GenericClassDescriptor getGenericClassDescriptor(StructClass cl) {
+    if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
+      StructGenericSignatureAttribute attr = cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_SIGNATURE);
+      if (attr != null) {
+        return GenericMain.parseClassSignature(attr.getSignature());
+      }
+    }
+    return null;
+  }
+
+  public static void appendTypeParameters(TextBuffer buffer, List<String> parameters, List<? extends List<GenericType>> bounds) {
     buffer.append('<');
 
     for (int i = 0; i < parameters.size(); i++) {
@@ -1098,4 +1085,4 @@ public class ClassWriter {
 
     buffer.append('>');
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
index b27e343..1ee22f2 100644
--- a/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
+import org.jetbrains.java.decompiler.code.Instruction;
+import org.jetbrains.java.decompiler.code.InstructionSequence;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeSourceMapper;
-import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.main.collectors.ImportCollector;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
@@ -31,105 +18,99 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructContext;
 import org.jetbrains.java.decompiler.struct.StructMethod;
+import org.jetbrains.java.decompiler.struct.attr.StructEnclosingMethodAttribute;
+import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
 import org.jetbrains.java.decompiler.struct.attr.StructInnerClassesAttribute;
+import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.io.IOException;
 import java.util.*;
 import java.util.Map.Entry;
 
-public class ClassesProcessor {
-
+public class ClassesProcessor implements CodeConstants {
   public static final int AVERAGE_CLASS_SIZE = 16 * 1024;
 
-  private final Map<String, ClassNode> mapRootClasses = new HashMap<String, ClassNode>();
+  private final StructContext context;
+  private final Map<String, ClassNode> mapRootClasses = new HashMap<>();
+
+  private static class Inner {
+    private String simpleName;
+    private int type;
+    private int accessFlags;
+
+    private static boolean equal(Inner o1, Inner o2) {
+      return o1.type == o2.type && o1.accessFlags == o2.accessFlags && InterpreterUtil.equalObjects(o1.simpleName, o2.simpleName);
+    }
+  }
 
   public ClassesProcessor(StructContext context) {
+    this.context = context;
+  }
 
-    HashMap<String, Object[]> mapInnerClasses = new HashMap<String, Object[]>();
-    HashMap<String, HashSet<String>> mapNestedClassReferences = new HashMap<String, HashSet<String>>();
-    HashMap<String, HashSet<String>> mapEnclosingClassReferences = new HashMap<String, HashSet<String>>();
-    HashMap<String, String> mapNewSimpleNames = new HashMap<String, String>();
+  public void loadClasses(IIdentifierRenamer renamer) {
+    Map<String, Inner> mapInnerClasses = new HashMap<>();
+    Map<String, Set<String>> mapNestedClassReferences = new HashMap<>();
+    Map<String, Set<String>> mapEnclosingClassReferences = new HashMap<>();
+    Map<String, String> mapNewSimpleNames = new HashMap<>();
 
     boolean bDecompileInner = DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_INNER);
+    boolean verifyAnonymousClasses = DecompilerContext.getOption(IFernflowerPreferences.VERIFY_ANONYMOUS_CLASSES);
 
     // create class nodes
     for (StructClass cl : context.getClasses().values()) {
       if (cl.isOwn() && !mapRootClasses.containsKey(cl.qualifiedName)) {
-
         if (bDecompileInner) {
-          StructInnerClassesAttribute inner = (StructInnerClassesAttribute)cl.getAttributes().getWithKey("InnerClasses");
+          StructInnerClassesAttribute inner = cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_INNER_CLASSES);
+
           if (inner != null) {
-
-            for (int i = 0; i < inner.getClassEntries().size(); i++) {
-
-              int[] entry = inner.getClassEntries().get(i);
-              String[] strentry = inner.getStringEntries().get(i);
-
-              Object[] arr = new Object[4]; // arr[0] not used
-
-              String innername = strentry[0];
-
-              // nested class type
-              arr[2] = entry[1] == 0 ? (entry[2] == 0 ? ClassNode.CLASS_ANONYMOUS : ClassNode.CLASS_LOCAL) : ClassNode.CLASS_MEMBER;
+            for (StructInnerClassesAttribute.Entry entry : inner.getEntries()) {
+              String innerName = entry.innerName;
 
               // original simple name
-              String simpleName = strentry[2];
-              String savedName = mapNewSimpleNames.get(innername);
-
+              String simpleName = entry.simpleName;
+              String savedName = mapNewSimpleNames.get(innerName);
               if (savedName != null) {
                 simpleName = savedName;
               }
-              else if (simpleName != null && DecompilerContext.getOption(IFernflowerPreferences.RENAME_ENTITIES)) {
-                IIdentifierRenamer renamer = DecompilerContext.getPoolInterceptor().getHelper();
-                if (renamer.toBeRenamed(IIdentifierRenamer.Type.ELEMENT_CLASS, simpleName, null, null)) {
-                  simpleName = renamer.getNextClassName(innername, simpleName);
-                  mapNewSimpleNames.put(innername, simpleName);
-                }
+              else if (simpleName != null &&
+                       renamer != null &&
+                       renamer.toBeRenamed(IIdentifierRenamer.Type.ELEMENT_CLASS, simpleName, null, null)) {
+                simpleName = renamer.getNextClassName(innerName, simpleName);
+                mapNewSimpleNames.put(innerName, simpleName);
               }
 
-              arr[1] = simpleName;
-
-              // original access flags
-              arr[3] = entry[3];
+              Inner rec = new Inner();
+              rec.simpleName = simpleName;
+              rec.type = entry.simpleNameIdx == 0 ? ClassNode.CLASS_ANONYMOUS : entry.outerNameIdx == 0 ? ClassNode.CLASS_LOCAL : ClassNode.CLASS_MEMBER;
+              rec.accessFlags = entry.accessFlags;
 
               // enclosing class
-              String enclClassName;
-              if (entry[1] != 0) {
-                enclClassName = strentry[1];
+              String enclClassName = entry.outerNameIdx != 0 ? entry.enclosingName : cl.qualifiedName;
+              if (enclClassName == null || innerName.equals(enclClassName)) {
+                continue;  // invalid name or self reference
               }
-              else {
-                enclClassName = cl.qualifiedName;
+              if (rec.type == ClassNode.CLASS_MEMBER && !innerName.equals(enclClassName + '$' + entry.simpleName)) {
+                continue;  // not a real inner class
               }
 
-              if (!innername.equals(enclClassName)) {  // self reference
-                StructClass enclosing_class = context.getClasses().get(enclClassName);
-                if (enclosing_class != null && enclosing_class.isOwn()) { // own classes only
-
-                  Object[] arrold = mapInnerClasses.get(innername);
-                  if (arrold == null) {
-                    mapInnerClasses.put(innername, arr);
-                  }
-                  else if (!InterpreterUtil.equalObjectArrays(arrold, arr)) {
-                    String message = "Inconsistent inner class entries for " + innername + "!";
-                    DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
-                  }
-
-                  // reference to the nested class
-                  HashSet<String> set = mapNestedClassReferences.get(enclClassName);
-                  if (set == null) {
-                    mapNestedClassReferences.put(enclClassName, set = new HashSet<String>());
-                  }
-                  set.add(innername);
-
-                  // reference to the enclosing class
-                  set = mapEnclosingClassReferences.get(innername);
-                  if (set == null) {
-                    mapEnclosingClassReferences.put(innername, set = new HashSet<String>());
-                  }
-                  set.add(enclClassName);
+              StructClass enclosingClass = context.getClasses().get(enclClassName);
+              if (enclosingClass != null && enclosingClass.isOwn()) { // own classes only
+                Inner existingRec = mapInnerClasses.get(innerName);
+                if (existingRec == null) {
+                  mapInnerClasses.put(innerName, rec);
                 }
+                else if (!Inner.equal(existingRec, rec)) {
+                  String message = "Inconsistent inner class entries for " + innerName + "!";
+                  DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
+                }
+
+                // reference to the nested class
+                mapNestedClassReferences.computeIfAbsent(enclClassName, k -> new HashSet<>()).add(innerName);
+                // reference to the enclosing class
+                mapEnclosingClassReferences.computeIfAbsent(innerName, k -> new HashSet<>()).add(enclClassName);
               }
             }
           }
@@ -142,30 +123,32 @@ public class ClassesProcessor {
     }
 
     if (bDecompileInner) {
-
       // connect nested classes
       for (Entry<String, ClassNode> ent : mapRootClasses.entrySet()) {
         // root class?
         if (!mapInnerClasses.containsKey(ent.getKey())) {
-
-          HashSet<String> setVisited = new HashSet<String>();
-          LinkedList<String> stack = new LinkedList<String>();
+          Set<String> setVisited = new HashSet<>();
+          LinkedList<String> stack = new LinkedList<>();
 
           stack.add(ent.getKey());
           setVisited.add(ent.getKey());
 
           while (!stack.isEmpty()) {
-
             String superClass = stack.removeFirst();
-            ClassNode supernode = mapRootClasses.get(superClass);
+            ClassNode superNode = mapRootClasses.get(superClass);
 
-            HashSet<String> setNestedClasses = mapNestedClassReferences.get(superClass);
+            Set<String> setNestedClasses = mapNestedClassReferences.get(superClass);
             if (setNestedClasses != null) {
+              StructClass scl = superNode.classStruct;
+              StructInnerClassesAttribute inner = scl.getAttribute(StructGeneralAttribute.ATTRIBUTE_INNER_CLASSES);
 
-              StructClass scl = supernode.classStruct;
-              StructInnerClassesAttribute inner = (StructInnerClassesAttribute)scl.getAttributes().getWithKey("InnerClasses");
-              for (int i = 0; i < inner.getStringEntries().size(); i++) {
-                String nestedClass = inner.getStringEntries().get(i)[0];
+              if (inner == null || inner.getEntries().isEmpty()) {
+                DecompilerContext.getLogger().writeMessage(superClass + " does not contain inner classes!", IFernflowerLogger.Severity.WARN);
+                continue;
+              }
+
+              for (StructInnerClassesAttribute.Entry entry : inner.getEntries()) {
+                String nestedClass = entry.innerName;
                 if (!setNestedClasses.contains(nestedClass)) {
                   continue;
                 }
@@ -174,52 +157,49 @@ public class ClassesProcessor {
                   continue;
                 }
 
-                ClassNode nestednode = mapRootClasses.get(nestedClass);
-                if (nestednode == null) {
+                ClassNode nestedNode = mapRootClasses.get(nestedClass);
+                if (nestedNode == null) {
                   DecompilerContext.getLogger().writeMessage("Nested class " + nestedClass + " missing!", IFernflowerLogger.Severity.WARN);
                   continue;
                 }
 
-                Object[] arr = mapInnerClasses.get(nestedClass);
+                Inner rec = mapInnerClasses.get(nestedClass);
 
                 //if ((Integer)arr[2] == ClassNode.CLASS_MEMBER) {
                   // FIXME: check for consistent naming
                 //}
 
-                nestednode.type = (Integer)arr[2];
-                nestednode.simpleName = (String)arr[1];
-                nestednode.access = (Integer)arr[3];
+                nestedNode.simpleName = rec.simpleName;
+                nestedNode.type = rec.type;
+                nestedNode.access = rec.accessFlags;
 
-                if (nestednode.type == ClassNode.CLASS_ANONYMOUS) {
-                  StructClass cl = nestednode.classStruct;
+                // sanity checks of the class supposed to be anonymous
+                if (verifyAnonymousClasses && nestedNode.type == ClassNode.CLASS_ANONYMOUS && !isAnonymous(nestedNode.classStruct, scl)) {
+                  nestedNode.type = ClassNode.CLASS_LOCAL;
+                }
 
-                  // remove static if anonymous class
-                  // a common compiler bug
-                  nestednode.access &= ~CodeConstants.ACC_STATIC;
+                if (nestedNode.type == ClassNode.CLASS_ANONYMOUS) {
+                  StructClass cl = nestedNode.classStruct;
+                  // remove static if anonymous class (a common compiler bug)
+                  nestedNode.access &= ~CodeConstants.ACC_STATIC;
 
                   int[] interfaces = cl.getInterfaces();
-
                   if (interfaces.length > 0) {
-                    if (interfaces.length > 1) {
-                      String message = "Inconsistent anonymous class definition: " + cl.qualifiedName;
-                      DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
-                    }
-                    nestednode.anonymousClassType = new VarType(cl.getInterface(0), true);
+                    nestedNode.anonymousClassType = new VarType(cl.getInterface(0), true);
                   }
                   else {
-                    nestednode.anonymousClassType = new VarType(cl.superClass.getString(), true);
+                    nestedNode.anonymousClassType = new VarType(cl.superClass.getString(), true);
                   }
                 }
-                else if (nestednode.type == ClassNode.CLASS_LOCAL) {
-                  // only abstract and final are permitted
-                  // a common compiler bug
-                  nestednode.access &= (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_FINAL);
+                else if (nestedNode.type == ClassNode.CLASS_LOCAL) {
+                  // only abstract and final are permitted (a common compiler bug)
+                  nestedNode.access &= (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_FINAL);
                 }
 
-                supernode.nested.add(nestednode);
-                nestednode.parent = supernode;
+                superNode.nested.add(nestedNode);
+                nestedNode.parent = superNode;
 
-                nestednode.enclosingClasses.addAll(mapEnclosingClassReferences.get(nestedClass));
+                nestedNode.enclosingClasses.addAll(mapEnclosingClassReferences.get(nestedClass));
 
                 stack.add(nestedClass);
               }
@@ -230,6 +210,92 @@ public class ClassesProcessor {
     }
   }
 
+  private static boolean isAnonymous(StructClass cl, StructClass enclosingCl) {
+    // checking super class and interfaces
+    int[] interfaces = cl.getInterfaces();
+    if (interfaces.length > 0) {
+      boolean hasNonTrivialSuperClass = cl.superClass != null && !VarType.VARTYPE_OBJECT.equals(new VarType(cl.superClass.getString(), true));
+      if (hasNonTrivialSuperClass || interfaces.length > 1) { // can't have multiple 'sources'
+        String message = "Inconsistent anonymous class definition: '" + cl.qualifiedName + "'. Multiple interfaces and/or super class defined.";
+        DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
+        return false;
+      }
+    }
+    else if (cl.superClass == null) { // neither interface nor super class defined
+      String message = "Inconsistent anonymous class definition: '" + cl.qualifiedName + "'. Neither interface nor super class defined.";
+      DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
+      return false;
+    }
+
+    // FIXME: check constructors
+    // FIXME: check enclosing class/method
+
+    ConstantPool pool = enclosingCl.getPool();
+
+    int refCounter = 0;
+    boolean refNotNew = false;
+
+    StructEnclosingMethodAttribute attribute = cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_ENCLOSING_METHOD);
+    String enclosingMethod = attribute != null ? attribute.getMethodName() : null;
+
+    // checking references in the enclosing class
+    for (StructMethod mt : enclosingCl.getMethods()) {
+      if (enclosingMethod != null && !enclosingMethod.equals(mt.getName())) {
+        continue;
+      }
+
+      try {
+        mt.expandData();
+
+        InstructionSequence seq = mt.getInstructionSequence();
+        if (seq != null) {
+          int len = seq.length();
+          for (int i = 0; i < len; i++) {
+            Instruction instr = seq.getInstr(i);
+            switch (instr.opcode) {
+              case opc_checkcast:
+              case opc_instanceof:
+                if (cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
+                  refCounter++;
+                  refNotNew = true;
+                }
+                break;
+              case opc_new:
+              case opc_anewarray:
+              case opc_multianewarray:
+                if (cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
+                  refCounter++;
+                }
+                break;
+              case opc_getstatic:
+              case opc_putstatic:
+                if (cl.qualifiedName.equals(pool.getLinkConstant(instr.operand(0)).classname)) {
+                  refCounter++;
+                  refNotNew = true;
+                }
+            }
+          }
+        }
+
+        mt.releaseResources();
+      }
+      catch (IOException ex) {
+        String message = "Could not read method while checking anonymous class definition: '" + enclosingCl.qualifiedName + "', '" +
+                         InterpreterUtil.makeUniqueKey(mt.getName(), mt.getDescriptor()) + "'";
+        DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
+        return false;
+      }
+
+      if (refCounter > 1 || refNotNew) {
+        String message = "Inconsistent references to the class '" + cl.qualifiedName + "' which is supposed to be anonymous";
+        DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
+        return false;
+      }
+    }
+
+    return true;
+  }
+
   public void writeClass(StructClass cl, TextBuffer buffer) throws IOException {
     ClassNode root = mapRootClasses.get(cl.qualifiedName);
     if (root.type != ClassNode.CLASS_ROOT) {
@@ -239,9 +305,7 @@ public class ClassesProcessor {
     DecompilerContext.getLogger().startReadingClass(cl.qualifiedName);
     try {
       ImportCollector importCollector = new ImportCollector(root);
-      DecompilerContext.setImportCollector(importCollector);
-      DecompilerContext.setCounterContainer(new CounterContainer());
-      DecompilerContext.setBytecodeSourceMapper(new BytecodeSourceMapper());
+      DecompilerContext.startClass(importCollector);
 
       new LambdaProcessor().processClass(root);
 
@@ -258,11 +322,8 @@ public class ClassesProcessor {
       TextBuffer classBuffer = new TextBuffer(AVERAGE_CLASS_SIZE);
       new ClassWriter().classToJava(root, classBuffer, 0, null);
 
-      int total_offset_lines = 0;
-
       int index = cl.qualifiedName.lastIndexOf("/");
       if (index >= 0) {
-        total_offset_lines+=2;
         String packageName = cl.qualifiedName.substring(0, index).replace('/', '.');
 
         buffer.append("package ");
@@ -275,16 +336,15 @@ public class ClassesProcessor {
       int import_lines_written = importCollector.writeImports(buffer);
       if (import_lines_written > 0) {
         buffer.appendLineSeparator();
-        total_offset_lines += import_lines_written + 1;
       }
-      //buffer.append(lineSeparator);
 
-      total_offset_lines = buffer.countLines();
+      int offsetLines = buffer.countLines();
+
       buffer.append(classBuffer);
 
       if (DecompilerContext.getOption(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING)) {
         BytecodeSourceMapper mapper = DecompilerContext.getBytecodeSourceMapper();
-        mapper.addTotalOffset(total_offset_lines);
+        mapper.addTotalOffset(offsetLines);
         if (DecompilerContext.getOption(IFernflowerPreferences.DUMP_ORIGINAL_LINES)) {
           buffer.dumpOriginalLineNumbers(mapper.getOriginalLinesMapping());
         }
@@ -300,8 +360,7 @@ public class ClassesProcessor {
     }
   }
 
-  private static void initWrappers(ClassNode node) throws IOException {
-
+  private static void initWrappers(ClassNode node) {
     if (node.type == ClassNode.CLASS_LAMBDA) {
       return;
     }
@@ -317,7 +376,6 @@ public class ClassesProcessor {
   }
 
   private static void addClassnameToImport(ClassNode node, ImportCollector imp) {
-
     if (node.simpleName != null && node.simpleName.length() > 0) {
       imp.getShortName(node.type == ClassNode.CLASS_ROOT ? node.classStruct.qualifiedName : node.simpleName, false);
     }
@@ -328,7 +386,6 @@ public class ClassesProcessor {
   }
 
   private static void destroyWrappers(ClassNode node) {
-
     node.wrapper = null;
     node.classStruct.releaseResources();
 
@@ -343,7 +400,6 @@ public class ClassesProcessor {
 
 
   public static class ClassNode {
-
     public static final int CLASS_ROOT = 0;
     public static final int CLASS_MEMBER = 1;
     public static final int CLASS_ANONYMOUS = 2;
@@ -357,13 +413,12 @@ public class ClassesProcessor {
     private ClassWrapper wrapper;
     public String enclosingMethod;
     public InvocationExprent superInvocation;
-    public final Map<String, VarVersionPair> mapFieldsToVars = new HashMap<String, VarVersionPair>();
+    public final Map<String, VarVersionPair> mapFieldsToVars = new HashMap<>();
     public VarType anonymousClassType;
-    public final List<ClassNode> nested = new ArrayList<ClassNode>();
-    public final Set<String> enclosingClasses = new HashSet<String>();
+    public final List<ClassNode> nested = new ArrayList<>();
+    public final Set<String> enclosingClasses = new HashSet<>();
     public ClassNode parent;
     public LambdaInformation lambdaInformation;
-    public boolean namelessConstructorStub = false;
 
     public ClassNode(String content_class_name,
                      String content_method_name,
@@ -378,7 +433,6 @@ public class ClassesProcessor {
 
       lambdaInformation = new LambdaInformation();
 
-      lambdaInformation.class_name = lambda_class_name;
       lambdaInformation.method_name = lambda_method_name;
       lambdaInformation.method_descriptor = lambda_method_descriptor;
 
@@ -428,7 +482,6 @@ public class ClassesProcessor {
     }
 
     public static class LambdaInformation {
-      public String class_name;
       public String method_name;
       public String method_descriptor;
 
@@ -442,4 +495,4 @@ public class ClassesProcessor {
       public boolean is_content_method_static;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
index 15c6e40..e293635 100644
--- a/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
+++ b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
@@ -1,65 +1,57 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.main.collectors.BytecodeSourceMapper;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.main.collectors.ImportCollector;
-import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.modules.renamer.PoolInterceptor;
 import org.jetbrains.java.decompiler.struct.StructContext;
 
-import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 
 public class DecompilerContext {
   public static final String CURRENT_CLASS = "CURRENT_CLASS";
   public static final String CURRENT_CLASS_WRAPPER = "CURRENT_CLASS_WRAPPER";
   public static final String CURRENT_CLASS_NODE = "CURRENT_CLASS_NODE";
-  public static final String CURRENT_METHOD = "CURRENT_METHOD";
-  public static final String CURRENT_METHOD_DESCRIPTOR = "CURRENT_METHOD_DESCRIPTOR";
   public static final String CURRENT_METHOD_WRAPPER = "CURRENT_METHOD_WRAPPER";
-  public static final String CURRENT_VAR_PROCESSOR = "CURRENT_VAR_PROCESSOR";
-
-  private static final ThreadLocal<DecompilerContext> currentContext = new ThreadLocal<DecompilerContext>();
 
   private final Map<String, Object> properties;
-  private StructContext structContext;
+  private final IFernflowerLogger logger;
+  private final StructContext structContext;
+  private final ClassesProcessor classProcessor;
+  private final PoolInterceptor poolInterceptor;
   private ImportCollector importCollector;
-  private VarNamesCollector varNamescollector;
+  private VarProcessor varProcessor;
   private CounterContainer counterContainer;
-  private ClassesProcessor classProcessor;
-  private PoolInterceptor poolInterceptor;
-  private IFernflowerLogger logger;
   private BytecodeSourceMapper bytecodeSourceMapper;
 
-  private DecompilerContext(Map<String, Object> properties) {
+  public DecompilerContext(Map<String, Object> properties,
+                           IFernflowerLogger logger,
+                           StructContext structContext,
+                           ClassesProcessor classProcessor,
+                           PoolInterceptor interceptor) {
+    Objects.requireNonNull(properties);
+    Objects.requireNonNull(logger);
+    Objects.requireNonNull(structContext);
+    Objects.requireNonNull(classProcessor);
+
     this.properties = properties;
+    this.logger = logger;
+    this.structContext = structContext;
+    this.classProcessor = classProcessor;
+    this.poolInterceptor = interceptor;
+    this.counterContainer = new CounterContainer();
   }
 
-  public static void initContext(Map<String, Object> propertiesCustom) {
-    Map<String, Object> properties = new HashMap<String, Object>(IFernflowerPreferences.DEFAULTS);
-    if (propertiesCustom != null) {
-      properties.putAll(propertiesCustom);
-    }
-    currentContext.set(new DecompilerContext(properties));
-  }
+  // *****************************************************************************
+  // context setup and update
+  // *****************************************************************************
+
+  private static final ThreadLocal<DecompilerContext> currentContext = new ThreadLocal<>();
 
   public static DecompilerContext getCurrentContext() {
     return currentContext.get();
@@ -69,93 +61,69 @@ public class DecompilerContext {
     currentContext.set(context);
   }
 
-  public static Object getProperty(String key) {
-    return getCurrentContext().properties.get(key);
-  }
-
   public static void setProperty(String key, Object value) {
     getCurrentContext().properties.put(key, value);
   }
 
+  public static void startClass(ImportCollector importCollector) {
+    DecompilerContext context = getCurrentContext();
+    context.importCollector = importCollector;
+    context.counterContainer = new CounterContainer();
+    context.bytecodeSourceMapper = new BytecodeSourceMapper();
+  }
+
+  public static void startMethod(VarProcessor varProcessor) {
+    DecompilerContext context = getCurrentContext();
+    context.varProcessor = varProcessor;
+    context.counterContainer = new CounterContainer();
+  }
+
+  // *****************************************************************************
+  // context access
+  // *****************************************************************************
+
+  public static Object getProperty(String key) {
+    return getCurrentContext().properties.get(key);
+  }
+
   public static boolean getOption(String key) {
-    return "1".equals(getCurrentContext().properties.get(key));
+    return "1".equals(getProperty(key));
   }
 
-  public static ImportCollector getImportCollector() {
-    return getCurrentContext().importCollector;
-  }
-
-  public static void setImportCollector(ImportCollector importCollector) {
-    getCurrentContext().importCollector = importCollector;
-  }
-
-  public static VarNamesCollector getVarNamesCollector() {
-    return getCurrentContext().varNamescollector;
-  }
-
-  public static void setVarNamesCollector(VarNamesCollector varNamesCollector) {
-    getCurrentContext().varNamescollector = varNamesCollector;
-  }
-
-  public static StructContext getStructContext() {
-    return getCurrentContext().structContext;
-  }
-
-  public static void setStructContext(StructContext structContext) {
-    getCurrentContext().structContext = structContext;
-  }
-
-  public static CounterContainer getCounterContainer() {
-    return getCurrentContext().counterContainer;
-  }
-
-  public static void setCounterContainer(CounterContainer counterContainer) {
-    getCurrentContext().counterContainer = counterContainer;
-  }
-
-  public static ClassesProcessor getClassProcessor() {
-    return getCurrentContext().classProcessor;
-  }
-
-  public static void setClassProcessor(ClassesProcessor classProcessor) {
-    getCurrentContext().classProcessor = classProcessor;
-  }
-
-  public static PoolInterceptor getPoolInterceptor() {
-    return getCurrentContext().poolInterceptor;
-  }
-
-  public static void setPoolInterceptor(PoolInterceptor poolinterceptor) {
-    getCurrentContext().poolInterceptor = poolinterceptor;
-  }
-
-  public static BytecodeSourceMapper getBytecodeSourceMapper() {
-    return getCurrentContext().bytecodeSourceMapper;
-  }
-
-  public static void setBytecodeSourceMapper(BytecodeSourceMapper bytecodeSourceMapper) {
-    getCurrentContext().bytecodeSourceMapper = bytecodeSourceMapper;
+  public static String getNewLineSeparator() {
+    return getOption(IFernflowerPreferences.NEW_LINE_SEPARATOR) ?
+           IFernflowerPreferences.LINE_SEPARATOR_UNX : IFernflowerPreferences.LINE_SEPARATOR_WIN;
   }
 
   public static IFernflowerLogger getLogger() {
     return getCurrentContext().logger;
   }
 
-  public static void setLogger(IFernflowerLogger logger) {
-    if (logger != null) {
-      String level = (String)getProperty(IFernflowerPreferences.LOG_LEVEL);
-      if (level != null) {
-        try {
-          logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.US)));
-        }
-        catch (IllegalArgumentException ignore) { }
-      }
-    }
-    getCurrentContext().logger = logger;
+  public static StructContext getStructContext() {
+    return getCurrentContext().structContext;
   }
 
-  public static String getNewLineSeparator() {
-    return getOption(IFernflowerPreferences.NEW_LINE_SEPARATOR) ?
-           IFernflowerPreferences.LINE_SEPARATOR_LIN : IFernflowerPreferences.LINE_SEPARATOR_WIN;
+  public static ClassesProcessor getClassProcessor() {
+    return getCurrentContext().classProcessor;
   }
-}
+
+  public static PoolInterceptor getPoolInterceptor() {
+    return getCurrentContext().poolInterceptor;
+  }
+
+  public static ImportCollector getImportCollector() {
+    return getCurrentContext().importCollector;
+  }
+
+  public static VarProcessor getVarProcessor() {
+    return getCurrentContext().varProcessor;
+  }
+
+  public static CounterContainer getCounterContainer() {
+    return getCurrentContext().counterContainer;
+  }
+
+  public static BytecodeSourceMapper getBytecodeSourceMapper() {
+    return getCurrentContext().bytecodeSourceMapper;
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/EnumProcessor.java b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
index 37a3384..08598e8 100644
--- a/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -20,16 +6,14 @@ import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statements;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructField;
 import org.jetbrains.java.decompiler.struct.StructMethod;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
 public class EnumProcessor {
-
   public static void clearEnum(ClassWrapper wrapper) {
     StructClass cl = wrapper.getClassStruct();
 
@@ -50,12 +34,12 @@ public class EnumProcessor {
         }
       }
       else if (CodeConstants.INIT_NAME.equals(name)) {
-        Statement firstData = findFirstData(method.root);
+        Statement firstData = Statements.findFirstData(method.root);
         if (firstData != null && !firstData.getExprents().isEmpty()) {
           Exprent exprent = firstData.getExprents().get(0);
           if (exprent.type == Exprent.EXPRENT_INVOCATION) {
-            InvocationExprent invexpr = (InvocationExprent)exprent;
-            if (isInvocationSuperConstructor(invexpr, method, wrapper)) {
+            InvocationExprent invExpr = (InvocationExprent)exprent;
+            if (Statements.isInvocationInitConstructor(invExpr, method, wrapper, false)) {
               firstData.getExprents().remove(0);
             }
           }
@@ -71,49 +55,4 @@ public class EnumProcessor {
       }
     }
   }
-
-  // FIXME: move to a util class (see also InitializerProcessor)
-  private static Statement findFirstData(Statement stat) {
-
-    if (stat.getExprents() != null) {
-      return stat;
-    }
-    else {
-      if (stat.isLabeled()) {
-        return null;
-      }
-
-      switch (stat.type) {
-        case Statement.TYPE_SEQUENCE:
-        case Statement.TYPE_IF:
-        case Statement.TYPE_ROOT:
-        case Statement.TYPE_SWITCH:
-        case Statement.TYPE_SYNCRONIZED:
-          return findFirstData(stat.getFirst());
-        default:
-          return null;
-      }
-    }
-  }
-
-  // FIXME: move to util class (see also InitializerProcessor)
-  private static boolean isInvocationSuperConstructor(InvocationExprent inv, MethodWrapper meth, ClassWrapper wrapper) {
-
-    if (inv.getFunctype() == InvocationExprent.TYP_INIT) {
-      if (inv.getInstance().type == Exprent.EXPRENT_VAR) {
-        VarExprent instvar = (VarExprent)inv.getInstance();
-        VarVersionPair varpaar = new VarVersionPair(instvar);
-
-        String classname = meth.varproc.getThisVars().get(varpaar);
-
-        if (classname != null) { // any this instance. TODO: Restrict to current class?
-          if (!wrapper.getClassStruct().qualifiedName.equals(inv.getClassname())) {
-            return true;
-          }
-        }
-      }
-    }
-
-    return false;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
index e355ee9..692c1b6 100644
--- a/src/org/jetbrains/java/decompiler/main/Fernflower.java
+++ b/src/org/jetbrains/java/decompiler/main/Fernflower.java
@@ -1,55 +1,88 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
-import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
-import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider;
-import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
-import org.jetbrains.java.decompiler.main.extern.IResultSaver;
-import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+import org.jetbrains.java.decompiler.main.extern.*;
+import org.jetbrains.java.decompiler.modules.renamer.ConverterHelper;
 import org.jetbrains.java.decompiler.modules.renamer.IdentifierConverter;
+import org.jetbrains.java.decompiler.modules.renamer.PoolInterceptor;
 import org.jetbrains.java.decompiler.struct.IDecompiledData;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructContext;
 import org.jetbrains.java.decompiler.struct.lazy.LazyLoader;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
+import java.io.File;
+import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 public class Fernflower implements IDecompiledData {
-
   private final StructContext structContext;
-  private ClassesProcessor classesProcessor;
+  private final ClassesProcessor classProcessor;
+  private final IIdentifierRenamer helper;
+  private final IdentifierConverter converter;
+
+  public Fernflower(IBytecodeProvider provider, IResultSaver saver, Map<String, Object> customProperties, IFernflowerLogger logger) {
+    Map<String, Object> properties = new HashMap<>(IFernflowerPreferences.DEFAULTS);
+    if (customProperties != null) {
+      properties.putAll(customProperties);
+    }
+
+    String level = (String)properties.get(IFernflowerPreferences.LOG_LEVEL);
+    if (level != null) {
+      try {
+        logger.setSeverity(IFernflowerLogger.Severity.valueOf(level.toUpperCase(Locale.ENGLISH)));
+      }
+      catch (IllegalArgumentException ignore) { }
+    }
 
-  public Fernflower(IBytecodeProvider provider, IResultSaver saver, Map<String, Object> options, IFernflowerLogger logger) {
     structContext = new StructContext(saver, this, new LazyLoader(provider));
-    DecompilerContext.initContext(options);
-    DecompilerContext.setCounterContainer(new CounterContainer());
-    DecompilerContext.setLogger(logger);
+    classProcessor = new ClassesProcessor(structContext);
+
+    PoolInterceptor interceptor = null;
+    if ("1".equals(properties.get(IFernflowerPreferences.RENAME_ENTITIES))) {
+      helper = loadHelper((String)properties.get(IFernflowerPreferences.USER_RENAMER_CLASS), logger);
+      interceptor = new PoolInterceptor();
+      converter = new IdentifierConverter(structContext, helper, interceptor);
+    }
+    else {
+      helper = null;
+      converter = null;
+    }
+
+    DecompilerContext context = new DecompilerContext(properties, logger, structContext, classProcessor, interceptor);
+    DecompilerContext.setCurrentContext(context);
+  }
+
+  private static IIdentifierRenamer loadHelper(String className, IFernflowerLogger logger) {
+    if (className != null) {
+      try {
+        Class<?> renamerClass = Fernflower.class.getClassLoader().loadClass(className);
+        return (IIdentifierRenamer) renamerClass.getDeclaredConstructor().newInstance();
+      }
+      catch (Exception e) {
+        logger.writeMessage("Cannot load renamer '" + className + "'", IFernflowerLogger.Severity.WARN, e);
+      }
+    }
+
+    return new ConverterHelper();
+  }
+
+  public void addSource(File source) {
+    structContext.addSpace(source, true);
+  }
+
+  public void addLibrary(File library) {
+    structContext.addSpace(library, false);
   }
 
   public void decompileContext() {
-    if (DecompilerContext.getOption(IFernflowerPreferences.RENAME_ENTITIES)) {
-      new IdentifierConverter().rename(structContext);
+    if (converter != null) {
+      converter.rename();
     }
 
-    classesProcessor = new ClassesProcessor(structContext);
-
-    DecompilerContext.setClassProcessor(classesProcessor);
-    DecompilerContext.setStructContext(structContext);
+    classProcessor.loadClasses(helper);
 
     structContext.saveContext();
   }
@@ -58,24 +91,18 @@ public class Fernflower implements IDecompiledData {
     DecompilerContext.setCurrentContext(null);
   }
 
-  public StructContext getStructContext() {
-    return structContext;
-  }
-
   @Override
   public String getClassEntryName(StructClass cl, String entryName) {
-    ClassNode node = classesProcessor.getMapRootClasses().get(cl.qualifiedName);
+    ClassNode node = classProcessor.getMapRootClasses().get(cl.qualifiedName);
     if (node.type != ClassNode.CLASS_ROOT) {
       return null;
     }
+    else if (converter != null) {
+      String simpleClassName = cl.qualifiedName.substring(cl.qualifiedName.lastIndexOf('/') + 1);
+      return entryName.substring(0, entryName.lastIndexOf('/') + 1) + simpleClassName + ".java";
+    }
     else {
-      if (DecompilerContext.getOption(IFernflowerPreferences.RENAME_ENTITIES)) {
-        String simple_classname = cl.qualifiedName.substring(cl.qualifiedName.lastIndexOf('/') + 1);
-        return entryName.substring(0, entryName.lastIndexOf('/') + 1) + simple_classname + ".java";
-      }
-      else {
-        return entryName.substring(0, entryName.lastIndexOf(".class")) + ".java";
-      }
+      return entryName.substring(0, entryName.lastIndexOf(".class")) + ".java";
     }
   }
 
@@ -84,12 +111,12 @@ public class Fernflower implements IDecompiledData {
     try {
       TextBuffer buffer = new TextBuffer(ClassesProcessor.AVERAGE_CLASS_SIZE);
       buffer.append(DecompilerContext.getProperty(IFernflowerPreferences.BANNER).toString());
-      classesProcessor.writeClass(cl, buffer);
+      classProcessor.writeClass(cl, buffer);
       return buffer.toString();
     }
-    catch (Throwable ex) {
-      DecompilerContext.getLogger().writeMessage("Class " + cl.qualifiedName + " couldn't be fully decompiled.", ex);
+    catch (Throwable t) {
+      DecompilerContext.getLogger().writeMessage("Class " + cl.qualifiedName + " couldn't be fully decompiled.", t);
       return null;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
index 2c3ecd8..3848fce 100644
--- a/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -23,6 +9,7 @@ import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
+import org.jetbrains.java.decompiler.modules.decompiler.stats.Statements;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructField;
@@ -31,9 +18,7 @@ import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import java.util.ArrayList;
 import java.util.List;
 
-
 public class InitializerProcessor {
-
   public static void extractInitializers(ClassWrapper wrapper) {
 
     MethodWrapper meth = wrapper.getMethodWrapper(CodeConstants.CLINIT_NAME, "()V");
@@ -54,30 +39,26 @@ public class InitializerProcessor {
     }
   }
 
-
   private static void liftConstructor(ClassWrapper wrapper) {
-
-    for (MethodWrapper meth : wrapper.getMethods()) {
-      if (CodeConstants.INIT_NAME.equals(meth.methodStruct.getName()) && meth.root != null) {
-        Statement firstdata = findFirstData(meth.root);
-        if (firstdata == null) {
+    for (MethodWrapper method : wrapper.getMethods()) {
+      if (CodeConstants.INIT_NAME.equals(method.methodStruct.getName()) && method.root != null) {
+        Statement firstData = Statements.findFirstData(method.root);
+        if (firstData == null) {
           return;
         }
 
-
         int index = 0;
-        List<Exprent> lstExprents = firstdata.getExprents();
+        List<Exprent> lstExprents = firstData.getExprents();
 
         for (Exprent exprent : lstExprents) {
-
           int action = 0;
 
           if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-            AssignmentExprent asexpr = (AssignmentExprent)exprent;
-            if (asexpr.getLeft().type == Exprent.EXPRENT_FIELD && asexpr.getRight().type == Exprent.EXPRENT_VAR) {
-              FieldExprent fexpr = (FieldExprent)asexpr.getLeft();
-              if (fexpr.getClassname().equals(wrapper.getClassStruct().qualifiedName)) {
-                StructField structField = wrapper.getClassStruct().getField(fexpr.getName(), fexpr.getDescriptor().descriptorString);
+            AssignmentExprent assignExpr = (AssignmentExprent)exprent;
+            if (assignExpr.getLeft().type == Exprent.EXPRENT_FIELD && assignExpr.getRight().type == Exprent.EXPRENT_VAR) {
+              FieldExprent fExpr = (FieldExprent)assignExpr.getLeft();
+              if (fExpr.getClassname().equals(wrapper.getClassStruct().qualifiedName)) {
+                StructField structField = wrapper.getClassStruct().getField(fExpr.getName(), fExpr.getDescriptor().descriptorString);
                 if (structField != null && structField.hasModifier(CodeConstants.ACC_FINAL)) {
                   action = 1;
                 }
@@ -85,7 +66,7 @@ public class InitializerProcessor {
             }
           }
           else if (index > 0 && exprent.type == Exprent.EXPRENT_INVOCATION &&
-                   isInvocationInitConstructor((InvocationExprent)exprent, meth, wrapper, true)) {
+                   Statements.isInvocationInitConstructor((InvocationExprent)exprent, method, wrapper, true)) {
             // this() or super()
             lstExprents.add(0, lstExprents.remove(index));
             action = 2;
@@ -101,52 +82,50 @@ public class InitializerProcessor {
     }
   }
 
-
   private static void hideEmptySuper(ClassWrapper wrapper) {
-
-    for (MethodWrapper meth : wrapper.getMethods()) {
-      if (CodeConstants.INIT_NAME.equals(meth.methodStruct.getName()) && meth.root != null) {
-        Statement firstdata = findFirstData(meth.root);
-        if (firstdata == null || firstdata.getExprents().isEmpty()) {
+    for (MethodWrapper method : wrapper.getMethods()) {
+      if (CodeConstants.INIT_NAME.equals(method.methodStruct.getName()) && method.root != null) {
+        Statement firstData = Statements.findFirstData(method.root);
+        if (firstData == null || firstData.getExprents().isEmpty()) {
           return;
         }
 
-        Exprent exprent = firstdata.getExprents().get(0);
+        Exprent exprent = firstData.getExprents().get(0);
         if (exprent.type == Exprent.EXPRENT_INVOCATION) {
-          InvocationExprent invexpr = (InvocationExprent)exprent;
-          if (isInvocationInitConstructor(invexpr, meth, wrapper, false) && invexpr.getLstParameters().isEmpty()) {
-            firstdata.getExprents().remove(0);
+          InvocationExprent invExpr = (InvocationExprent)exprent;
+          if (Statements.isInvocationInitConstructor(invExpr, method, wrapper, false) && invExpr.getLstParameters().isEmpty()) {
+            firstData.getExprents().remove(0);
           }
         }
       }
     }
   }
 
-  private static void extractStaticInitializers(ClassWrapper wrapper, MethodWrapper meth) {
-
-    RootStatement root = meth.root;
+  private static void extractStaticInitializers(ClassWrapper wrapper, MethodWrapper method) {
+    RootStatement root = method.root;
     StructClass cl = wrapper.getClassStruct();
+    Statement firstData = Statements.findFirstData(root);
+    if (firstData != null) {
+      boolean inlineInitializers = cl.hasModifier(CodeConstants.ACC_INTERFACE) || cl.hasModifier(CodeConstants.ACC_ENUM);
 
-    Statement firstdata = findFirstData(root);
-    if (firstdata != null) {
-      while (!firstdata.getExprents().isEmpty()) {
-        Exprent exprent = firstdata.getExprents().get(0);
+      while (!firstData.getExprents().isEmpty()) {
+        Exprent exprent = firstData.getExprents().get(0);
 
         boolean found = false;
 
         if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-          AssignmentExprent asexpr = (AssignmentExprent)exprent;
-          if (asexpr.getLeft().type == Exprent.EXPRENT_FIELD) {
-            FieldExprent fexpr = (FieldExprent)asexpr.getLeft();
-            if (fexpr.isStatic() && fexpr.getClassname().equals(cl.qualifiedName) &&
-                cl.hasField(fexpr.getName(), fexpr.getDescriptor().descriptorString)) {
+          AssignmentExprent assignExpr = (AssignmentExprent)exprent;
+          if (assignExpr.getLeft().type == Exprent.EXPRENT_FIELD) {
+            FieldExprent fExpr = (FieldExprent)assignExpr.getLeft();
+            if (fExpr.isStatic() && fExpr.getClassname().equals(cl.qualifiedName) &&
+                cl.hasField(fExpr.getName(), fExpr.getDescriptor().descriptorString)) {
 
-              if (isExprentIndependent(asexpr.getRight(), meth)) {
-
-                String keyField = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
+              // interfaces fields should always be initialized inline
+              if (inlineInitializers || isExprentIndependent(assignExpr.getRight(), method)) {
+                String keyField = InterpreterUtil.makeUniqueKey(fExpr.getName(), fExpr.getDescriptor().descriptorString);
                 if (!wrapper.getStaticFieldInitializers().containsKey(keyField)) {
-                  wrapper.getStaticFieldInitializers().addWithKey(asexpr.getRight(), keyField);
-                  firstdata.getExprents().remove(0);
+                  wrapper.getStaticFieldInitializers().addWithKey(assignExpr.getRight(), keyField);
+                  firstData.getExprents().remove(0);
                   found = true;
                 }
               }
@@ -162,27 +141,26 @@ public class InitializerProcessor {
   }
 
   private static void extractDynamicInitializers(ClassWrapper wrapper) {
-
     StructClass cl = wrapper.getClassStruct();
 
     boolean isAnonymous = DecompilerContext.getClassProcessor().getMapRootClasses().get(cl.qualifiedName).type == ClassNode.CLASS_ANONYMOUS;
 
-    List<List<Exprent>> lstFirst = new ArrayList<List<Exprent>>();
-    List<MethodWrapper> lstMethWrappers = new ArrayList<MethodWrapper>();
+    List<List<Exprent>> lstFirst = new ArrayList<>();
+    List<MethodWrapper> lstMethodWrappers = new ArrayList<>();
 
-    for (MethodWrapper meth : wrapper.getMethods()) {
-      if (CodeConstants.INIT_NAME.equals(meth.methodStruct.getName()) && meth.root != null) { // successfully decompiled constructor
-        Statement firstdata = findFirstData(meth.root);
-        if (firstdata == null || firstdata.getExprents().isEmpty()) {
+    for (MethodWrapper method : wrapper.getMethods()) {
+      if (CodeConstants.INIT_NAME.equals(method.methodStruct.getName()) && method.root != null) { // successfully decompiled constructor
+        Statement firstData = Statements.findFirstData(method.root);
+        if (firstData == null || firstData.getExprents().isEmpty()) {
           return;
         }
-        lstFirst.add(firstdata.getExprents());
-        lstMethWrappers.add(meth);
+        lstFirst.add(firstData.getExprents());
+        lstMethodWrappers.add(method);
 
-        Exprent exprent = firstdata.getExprents().get(0);
+        Exprent exprent = firstData.getExprents().get(0);
         if (!isAnonymous) { // FIXME: doesn't make sense
           if (exprent.type != Exprent.EXPRENT_INVOCATION ||
-              !isInvocationInitConstructor((InvocationExprent)exprent, meth, wrapper, false)) {
+              !Statements.isInvocationInitConstructor((InvocationExprent)exprent, method, wrapper, false)) {
             return;
           }
         }
@@ -194,12 +172,10 @@ public class InitializerProcessor {
     }
 
     while (true) {
-
       String fieldWithDescr = null;
       Exprent value = null;
 
       for (int i = 0; i < lstFirst.size(); i++) {
-
         List<Exprent> lst = lstFirst.get(i);
 
         if (lst.size() < (isAnonymous ? 1 : 2)) {
@@ -211,22 +187,21 @@ public class InitializerProcessor {
         boolean found = false;
 
         if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-          AssignmentExprent asexpr = (AssignmentExprent)exprent;
-          if (asexpr.getLeft().type == Exprent.EXPRENT_FIELD) {
-            FieldExprent fexpr = (FieldExprent)asexpr.getLeft();
-            if (!fexpr.isStatic() && fexpr.getClassname().equals(cl.qualifiedName) &&
-                cl.hasField(fexpr.getName(), fexpr
-                  .getDescriptor().descriptorString)) { // check for the physical existence of the field. Could be defined in a superclass.
+          AssignmentExprent assignExpr = (AssignmentExprent)exprent;
+          if (assignExpr.getLeft().type == Exprent.EXPRENT_FIELD) {
+            FieldExprent fExpr = (FieldExprent)assignExpr.getLeft();
+            if (!fExpr.isStatic() && fExpr.getClassname().equals(cl.qualifiedName) &&
+                cl.hasField(fExpr.getName(), fExpr.getDescriptor().descriptorString)) { // check for the physical existence of the field. Could be defined in a superclass.
 
-              if (isExprentIndependent(asexpr.getRight(), lstMethWrappers.get(i))) {
-                String fieldKey = InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString);
+              if (isExprentIndependent(assignExpr.getRight(), lstMethodWrappers.get(i))) {
+                String fieldKey = InterpreterUtil.makeUniqueKey(fExpr.getName(), fExpr.getDescriptor().descriptorString);
                 if (fieldWithDescr == null) {
                   fieldWithDescr = fieldKey;
-                  value = asexpr.getRight();
+                  value = assignExpr.getRight();
                 }
                 else {
                   if (!fieldWithDescr.equals(fieldKey) ||
-                      !value.equals(asexpr.getRight())) {
+                      !value.equals(assignExpr.getRight())) {
                     return;
                   }
                 }
@@ -254,19 +229,17 @@ public class InitializerProcessor {
     }
   }
 
-  private static boolean isExprentIndependent(Exprent exprent, MethodWrapper meth) {
-
+  private static boolean isExprentIndependent(Exprent exprent, MethodWrapper method) {
     List<Exprent> lst = exprent.getAllExprents(true);
     lst.add(exprent);
 
     for (Exprent expr : lst) {
       switch (expr.type) {
         case Exprent.EXPRENT_VAR:
-          VarVersionPair varpaar = new VarVersionPair((VarExprent)expr);
-          if (!meth.varproc.getExternalVars().contains(varpaar)) {
-            String varname = meth.varproc.getVarName(varpaar);
-
-            if (!varname.equals("this") && !varname.endsWith(".this")) { // FIXME: remove direct comparison with strings
+          VarVersionPair varPair = new VarVersionPair((VarExprent)expr);
+          if (!method.varproc.getExternalVars().contains(varPair)) {
+            String varName = method.varproc.getVarName(varPair);
+            if (!varName.equals("this") && !varName.endsWith(".this")) { // FIXME: remove direct comparison with strings
               return false;
             }
           }
@@ -278,48 +251,4 @@ public class InitializerProcessor {
 
     return true;
   }
-
-
-  private static Statement findFirstData(Statement stat) {
-
-    if (stat.getExprents() != null) {
-      return stat;
-    }
-    else {
-      if (stat.isLabeled()) { // FIXME: Why??
-        return null;
-      }
-
-      switch (stat.type) {
-        case Statement.TYPE_SEQUENCE:
-        case Statement.TYPE_IF:
-        case Statement.TYPE_ROOT:
-        case Statement.TYPE_SWITCH:
-        case Statement.TYPE_SYNCRONIZED:
-          return findFirstData(stat.getFirst());
-        default:
-          return null;
-      }
-    }
-  }
-
-  private static boolean isInvocationInitConstructor(InvocationExprent inv, MethodWrapper meth, ClassWrapper wrapper, boolean withThis) {
-
-    if (inv.getFunctype() == InvocationExprent.TYP_INIT) {
-      if (inv.getInstance().type == Exprent.EXPRENT_VAR) {
-        VarExprent instvar = (VarExprent)inv.getInstance();
-        VarVersionPair varpaar = new VarVersionPair(instvar);
-
-        String classname = meth.varproc.getThisVars().get(varpaar);
-
-        if (classname != null) { // any this instance. TODO: Restrict to current class?
-          if (withThis || !wrapper.getClassStruct().qualifiedName.equals(inv.getClassname())) {
-            return true;
-          }
-        }
-      }
-    }
-
-    return false;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
index e25cca2..c6a23b3 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.collectors;
 
 import org.jetbrains.java.decompiler.struct.attr.StructLineNumberTableAttribute;
@@ -21,13 +7,11 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class BytecodeMappingTracer {
+  public static final BytecodeMappingTracer DUMMY = new BytecodeMappingTracer();
 
   private int currentSourceLine;
-
   private StructLineNumberTableAttribute lineNumberTable = null;
-
-  // bytecode offset, source line
-  private final Map<Integer, Integer> mapping = new HashMap<Integer, Integer>();
+  private final Map<Integer, Integer> mapping = new HashMap<>();  // bytecode offset, source line
 
   public BytecodeMappingTracer() { }
 
@@ -43,16 +27,8 @@ public class BytecodeMappingTracer {
     currentSourceLine += number_lines;
   }
 
-  public void shiftSourceLines(int shift) {
-    for (Entry<Integer, Integer> entry : mapping.entrySet()) {
-      entry.setValue(entry.getValue() + shift);
-    }
-  }
-
   public void addMapping(int bytecode_offset) {
-    if (!mapping.containsKey(bytecode_offset)) {
-      mapping.put(bytecode_offset, currentSourceLine);
-    }
+    mapping.putIfAbsent(bytecode_offset, currentSourceLine);
   }
 
   public void addMapping(Set<Integer> bytecode_offsets) {
@@ -66,9 +42,7 @@ public class BytecodeMappingTracer {
   public void addTracer(BytecodeMappingTracer tracer) {
     if (tracer != null) {
       for (Entry<Integer, Integer> entry : tracer.mapping.entrySet()) {
-        if (!mapping.containsKey(entry.getKey())) {
-          mapping.put(entry.getKey(), entry.getValue());
-        }
+        mapping.putIfAbsent(entry.getKey(), entry.getValue());
       }
     }
   }
@@ -89,7 +63,7 @@ public class BytecodeMappingTracer {
     this.lineNumberTable = lineNumberTable;
   }
 
-  private final Set<Integer> unmappedLines = new HashSet<Integer>();
+  private final Set<Integer> unmappedLines = new HashSet<>();
 
   public Set<Integer> getUnmappedLines() {
     return unmappedLines;
@@ -100,7 +74,7 @@ public class BytecodeMappingTracer {
       return Collections.emptyMap();
     }
 
-    Map<Integer, Integer> res = new HashMap<Integer, Integer>();
+    Map<Integer, Integer> res = new HashMap<>();
 
     // first match offsets from line number table
     int[] data = lineNumberTable.getRawData();
@@ -126,4 +100,4 @@ public class BytecodeMappingTracer {
     }
     return res;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
index 8d3770b..67fb04f 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
@@ -1,52 +1,28 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.collectors;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.*;
 import java.util.Map.Entry;
 
 public class BytecodeSourceMapper {
-
   private int offset_total;
 
   // class, method, bytecode offset, source line
-  private final Map<String, Map<String, Map<Integer, Integer>>> mapping = new LinkedHashMap<String, Map<String, Map<Integer, Integer>>>();
+  private final Map<String, Map<String, Map<Integer, Integer>>> mapping = new LinkedHashMap<>();
 
   // original line to decompiled line
-  private final Map<Integer, Integer> linesMapping = new HashMap<Integer, Integer>();
-  private final Set<Integer> unmappedLines = new TreeSet<Integer>();
+  private final Map<Integer, Integer> linesMapping = new HashMap<>();
+  private final Set<Integer> unmappedLines = new TreeSet<>();
 
   public void addMapping(String className, String methodName, int bytecodeOffset, int sourceLine) {
-    Map<String, Map<Integer, Integer>> class_mapping = mapping.get(className);
-    if (class_mapping == null) {
-      mapping.put(className, class_mapping = new LinkedHashMap<String, Map<Integer, Integer>>()); // need to preserve order
-    }
-
-    Map<Integer, Integer> method_mapping = class_mapping.get(methodName);
-    if (method_mapping == null) {
-      class_mapping.put(methodName, method_mapping = new HashMap<Integer, Integer>());
-    }
+    Map<String, Map<Integer, Integer>> class_mapping = mapping.computeIfAbsent(className, k -> new LinkedHashMap<>()); // need to preserve order
+    Map<Integer, Integer> method_mapping = class_mapping.computeIfAbsent(methodName, k -> new HashMap<>());
 
     // don't overwrite
-    if (!method_mapping.containsKey(bytecodeOffset)) {
-      method_mapping.put(bytecodeOffset, sourceLine);
-    }
+    method_mapping.putIfAbsent(bytecodeOffset, sourceLine);
   }
 
   public void addTracer(String className, String methodName, BytecodeMappingTracer tracer) {
@@ -78,7 +54,7 @@ public class BytecodeSourceMapper {
 
         buffer.appendIndent(1).append("method '" + method_entry.getKey() + "' {" + lineSeparator);
 
-        List<Integer> lstBytecodeOffsets = new ArrayList<Integer>(method_mapping.keySet());
+        List<Integer> lstBytecodeOffsets = new ArrayList<>(method_mapping.keySet());
         Collections.sort(lstBytecodeOffsets);
 
         for (Integer offset : lstBytecodeOffsets) {
@@ -97,7 +73,7 @@ public class BytecodeSourceMapper {
 
     // lines mapping
     buffer.append("Lines mapping:").appendLineSeparator();
-    Map<Integer, Integer> sorted = new TreeMap<Integer, Integer>(linesMapping);
+    Map<Integer, Integer> sorted = new TreeMap<>(linesMapping);
     for (Entry<Integer, Integer> entry : sorted.entrySet()) {
       buffer.append(entry.getKey()).append(" <-> ").append(entry.getValue() + offset_total + 1).appendLineSeparator();
     }
@@ -112,14 +88,6 @@ public class BytecodeSourceMapper {
     }
   }
 
-  public int getTotalOffset() {
-    return offset_total;
-  }
-
-  public void setTotalOffset(int offset_total) {
-    this.offset_total = offset_total;
-  }
-
   public void addTotalOffset(int offset_total) {
     this.offset_total += offset_total;
   }
@@ -138,4 +106,4 @@ public class BytecodeSourceMapper {
     }
     return res;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/CounterContainer.java b/src/org/jetbrains/java/decompiler/main/collectors/CounterContainer.java
index 3fa3fd2..7091694 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/CounterContainer.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/CounterContainer.java
@@ -1,24 +1,9 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.collectors;
 
 public class CounterContainer {
-
   public static final int STATEMENT_COUNTER = 0;
-  public static final int EXPRENT_COUNTER = 1;
+  public static final int EXPRESSION_COUNTER = 1;
   public static final int VAR_COUNTER = 2;
 
   private final int[] values = new int[]{1, 1, 1};
@@ -34,4 +19,4 @@ public class CounterContainer {
   public int getCounterAndIncrement(int counter) {
     return values[counter]++;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index 05dc835..7b8c3b4 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -1,157 +1,184 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.collectors;
 
-import org.jetbrains.java.decompiler.main.ClassesProcessor;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
+import org.jetbrains.java.decompiler.struct.attr.StructInnerClassesAttribute;
+import org.jetbrains.java.decompiler.util.TextBuffer;
+import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructContext;
+import org.jetbrains.java.decompiler.struct.StructField;
 
 import java.util.*;
-import java.util.Map.Entry;
-
+import java.util.stream.Collectors;
 
 public class ImportCollector {
-
   private static final String JAVA_LANG_PACKAGE = "java.lang";
 
-  private final Map<String, String> mapSimpleNames = new HashMap<String, String>();
-  private final Set<String> setNotImportedNames = new HashSet<String>();
-  private String currentPackageSlash = "";
-  private String currentPackagePoint = "";
+  private final Map<String, String> mapSimpleNames = new HashMap<>();
+  private final Set<String> setNotImportedNames = new HashSet<>();
+  // set of field names in this class and all its predecessors.
+  private final Set<String> setFieldNames = new HashSet<>();
+  private final Set<String> setInnerClassNames = new HashSet<>();
+  private final String currentPackageSlash;
+  private final String currentPackagePoint;
 
   public ImportCollector(ClassNode root) {
-
-    String clname = root.classStruct.qualifiedName;
-    int index = clname.lastIndexOf("/");
+    String clName = root.classStruct.qualifiedName;
+    int index = clName.lastIndexOf('/');
     if (index >= 0) {
-      currentPackageSlash = clname.substring(0, index);
-      currentPackagePoint = currentPackageSlash.replace('/', '.');
-      currentPackageSlash += "/";
+      String packageName = clName.substring(0, index);
+      currentPackageSlash = packageName + '/';
+      currentPackagePoint = packageName.replace('/', '.');
+    }
+    else {
+      currentPackageSlash = "";
+      currentPackagePoint = "";
+    }
+
+    Map<String, StructClass> classes = DecompilerContext.getStructContext().getClasses();
+    LinkedList<String> queue = new LinkedList<>();
+    StructClass currentClass = root.classStruct;
+    while (currentClass != null) {
+      if (currentClass.superClass != null) {
+        queue.add(currentClass.superClass.getString());
+      }
+
+      Collections.addAll(queue, currentClass.getInterfaceNames());
+
+      // all field names for the current class ..
+      for (StructField f : currentClass.getFields()) {
+        setFieldNames.add(f.getName());
+      }
+
+      // .. all inner classes for the current class ..
+      StructInnerClassesAttribute attribute = currentClass.getAttribute(StructGeneralAttribute.ATTRIBUTE_INNER_CLASSES);
+      if (attribute != null) {
+        for (StructInnerClassesAttribute.Entry entry : attribute.getEntries()) {
+          if (entry.enclosingName != null && entry.enclosingName.equals(currentClass.qualifiedName)) {
+            setInnerClassNames.add(entry.simpleName);
+          }
+        }
+      }
+
+      // .. and traverse through parent.
+      currentClass = !queue.isEmpty() ? classes.get(queue.removeFirst()) : null;
+      while (currentClass == null && !queue.isEmpty()) {
+        currentClass = classes.get(queue.removeFirst());
+      }
     }
   }
 
-  public String getShortName(String fullname) {
-    return getShortName(fullname, true);
+  /**
+   * Check whether the package-less name ClassName is shaded by variable in a context of
+   * the decompiled class
+   * @param classToName - pkg.name.ClassName - class to find shortname for
+   * @return ClassName if the name is not shaded by local field, pkg.name.ClassName otherwise
+   */
+  public String getShortNameInClassContext(String classToName) {
+    String shortName = getShortName(classToName);
+    if (setFieldNames.contains(shortName)) {
+      return classToName;
+    }
+    else {
+      return shortName;
+    }
   }
 
-  public String getShortName(String fullname, boolean imported) {
+  public String getShortName(String fullName) {
+    return getShortName(fullName, true);
+  }
 
-    ClassesProcessor clproc = DecompilerContext.getClassProcessor();
-    ClassNode node = clproc.getMapRootClasses().get(fullname.replace('.', '/'));
-
-    String retname = null;
+  public String getShortName(String fullName, boolean imported) {
+    ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(fullName.replace('.', '/')); //todo[r.sh] anonymous classes?
 
+    String result = null;
     if (node != null && node.classStruct.isOwn()) {
-
-      retname = node.simpleName;
+      result = node.simpleName;
 
       while (node.parent != null && node.type == ClassNode.CLASS_MEMBER) {
-        retname = node.parent.simpleName + "." + retname;
+        //noinspection StringConcatenationInLoop
+        result = node.parent.simpleName + '.' + result;
         node = node.parent;
       }
 
       if (node.type == ClassNode.CLASS_ROOT) {
-        fullname = node.classStruct.qualifiedName;
-        fullname = fullname.replace('/', '.');
+        fullName = node.classStruct.qualifiedName;
+        fullName = fullName.replace('/', '.');
       }
       else {
-        return retname;
+        return result;
       }
     }
     else {
-      fullname = fullname.replace('$', '.');
+      fullName = fullName.replace('$', '.');
     }
 
-    String nshort = fullname;
-    String npackage = "";
+    String shortName = fullName;
+    String packageName = "";
 
-    int lastpoint = fullname.lastIndexOf(".");
-
-    if (lastpoint >= 0) {
-      nshort = fullname.substring(lastpoint + 1);
-      npackage = fullname.substring(0, lastpoint);
+    int lastDot = fullName.lastIndexOf('.');
+    if (lastDot >= 0) {
+      shortName = fullName.substring(lastDot + 1);
+      packageName = fullName.substring(0, lastDot);
     }
 
     StructContext context = DecompilerContext.getStructContext();
 
-    // check for another class which could 'shadow' this one. Two cases:
+    // check for another class which could 'shadow' this one. Three cases:
     // 1) class with the same short name in the current package
     // 2) class with the same short name in the default package
-    boolean existsDefaultClass = (context.getClass(currentPackageSlash + nshort) != null
-                                  && !npackage.equals(currentPackagePoint)) // current package
-                                 || (context.getClass(nshort) != null 
-                                  && !currentPackagePoint.isEmpty());  // default package
+    // 3) inner class with the same short name in the current class, a super class, or an implemented interface
+    boolean existsDefaultClass =
+      (context.getClass(currentPackageSlash + shortName) != null && !packageName.equals(currentPackagePoint)) || // current package
+      (context.getClass(shortName) != null && !currentPackagePoint.isEmpty()) || // default package
+      setInnerClassNames.contains(shortName); // inner class
 
     if (existsDefaultClass ||
-        (mapSimpleNames.containsKey(nshort) && !npackage.equals(mapSimpleNames.get(nshort)))) {
-      return fullname;
+        (mapSimpleNames.containsKey(shortName) && !packageName.equals(mapSimpleNames.get(shortName)))) {
+      //  don't return full name because if the class is a inner class, full name refers to the parent full name, not the child full name
+      return result == null ? fullName : (packageName + "." + result);
     }
-    else if (!mapSimpleNames.containsKey(nshort)) {
-      mapSimpleNames.put(nshort, npackage);
-
+    else if (!mapSimpleNames.containsKey(shortName)) {
+      mapSimpleNames.put(shortName, packageName);
       if (!imported) {
-        setNotImportedNames.add(nshort);
+        setNotImportedNames.add(shortName);
       }
     }
 
-    return retname == null ? nshort : retname;
+    return result == null ? shortName : result;
   }
 
   public int writeImports(TextBuffer buffer) {
-    int importlines_written = 0;
+    int importLinesWritten = 0;
 
     List<String> imports = packImports();
 
     for (String s : imports) {
       buffer.append("import ");
       buffer.append(s);
-      buffer.append(";");
+      buffer.append(';');
       buffer.appendLineSeparator();
 
-      importlines_written++;
+      importLinesWritten++;
     }
 
-    return importlines_written;
+    return importLinesWritten;
   }
 
   private List<String> packImports() {
-    List<Entry<String, String>> lst = new ArrayList<Entry<String, String>>(mapSimpleNames.entrySet());
-
-    Collections.sort(lst, new Comparator<Entry<String, String>>() {
-      public int compare(Entry<String, String> par0, Entry<String, String> par1) {
-        int res = par0.getValue().compareTo(par1.getValue());
-        if (res == 0) {
-          res = par0.getKey().compareTo(par1.getKey());
-        }
-        return res;
-      }
-    });
-
-    List<String> res = new ArrayList<String>();
-    for (Entry<String, String> ent : lst) {
-      // exclude a current class or one of the nested ones, java.lang and empty packages
-      if (!setNotImportedNames.contains(ent.getKey()) &&
-          !JAVA_LANG_PACKAGE.equals(ent.getValue()) &&
-          !ent.getValue().isEmpty()) {
-        res.add(ent.getValue() + "." + ent.getKey());
-      }
-    }
-
-    return res;
+    return mapSimpleNames.entrySet().stream()
+      .filter(ent ->
+                // exclude the current class or one of the nested ones
+                // empty, java.lang and the current packages
+                !setNotImportedNames.contains(ent.getKey()) &&
+                !ent.getValue().isEmpty() &&
+                !JAVA_LANG_PACKAGE.equals(ent.getValue()) &&
+                !ent.getValue().equals(currentPackagePoint)
+      )
+      .sorted(Map.Entry.<String, String>comparingByValue().thenComparing(Map.Entry.comparingByKey()))
+      .map(ent -> ent.getValue() + "." + ent.getKey())
+      .collect(Collectors.toList());
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
index 33bf42c..5d03d2e 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
@@ -1,30 +1,17 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.collectors;
 
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
 public class VarNamesCollector {
 
-  private final Set<String> usedNames = new HashSet<String>();
+  private final Set<String> usedNames = new HashSet<>();
 
   public VarNamesCollector() { }
 
-  public VarNamesCollector(Set<String> setNames) {
+  public VarNamesCollector(Collection<String> setNames) {
     usedNames.addAll(setNames);
   }
 
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
index 07b8578..57bae44 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.decompiler;
 
 import org.jetbrains.java.decompiler.main.Fernflower;
@@ -21,27 +7,41 @@ import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
 import org.jetbrains.java.decompiler.main.extern.IResultSaver;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.Map;
 
+@SuppressWarnings("unused")
 public class BaseDecompiler {
-
-  private final Fernflower fernflower;
+  private final Fernflower engine;
 
   public BaseDecompiler(IBytecodeProvider provider, IResultSaver saver, Map<String, Object> options, IFernflowerLogger logger) {
-    fernflower = new Fernflower(provider, saver, options, logger);
+    engine = new Fernflower(provider, saver, options, logger);
   }
 
-  public void addSpace(File file, boolean isOwn) throws IOException {
-    fernflower.getStructContext().addSpace(file, isOwn);
+  public void addSource(File source) {
+    engine.addSource(source);
+  }
+
+  public void addLibrary(File library) {
+    engine.addLibrary(library);
+  }
+
+  /** @deprecated use {@link #addSource(File)} / {@link #addLibrary(File)} instead */
+  @Deprecated
+  public void addSpace(File file, boolean own) {
+    if (own) {
+      addSource(file);
+    }
+    else {
+      addLibrary(file);
+    }
   }
 
   public void decompileContext() {
     try {
-      fernflower.decompileContext();
+      engine.decompileContext();
     }
     finally {
-      fernflower.clearContext();
+      engine.clearContext();
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
index 7924b1c..120470d 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.decompiler;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
@@ -23,6 +9,7 @@ import org.jetbrains.java.decompiler.main.extern.IResultSaver;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
@@ -31,7 +18,6 @@ import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
 public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
-
   @SuppressWarnings("UseOfSystemOutOrSystemErr")
   public static void main(String[] args) {
     if (args.length < 2) {
@@ -41,9 +27,9 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
       return;
     }
 
-    Map<String, Object> mapOptions = new HashMap<String, Object>();
-    List<File> lstSources = new ArrayList<File>();
-    List<File> lstLibraries = new ArrayList<File>();
+    Map<String, Object> mapOptions = new HashMap<>();
+    List<File> sources = new ArrayList<>();
+    List<File> libraries = new ArrayList<>();
 
     boolean isOption = true;
     for (int i = 0; i < args.length - 1; ++i) { // last parameter - destination
@@ -64,15 +50,15 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
         isOption = false;
 
         if (arg.startsWith("-e=")) {
-          addPath(lstLibraries, arg.substring(3));
+          addPath(libraries, arg.substring(3));
         }
         else {
-          addPath(lstSources, arg);
+          addPath(sources, arg);
         }
       }
     }
 
-    if (lstSources.isEmpty()) {
+    if (sources.isEmpty()) {
       System.out.println("error: no sources given");
       return;
     }
@@ -86,18 +72,18 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
     PrintStreamLogger logger = new PrintStreamLogger(System.out);
     ConsoleDecompiler decompiler = new ConsoleDecompiler(destination, mapOptions, logger);
 
-    for (File source : lstSources) {
-      decompiler.addSpace(source, true);
+    for (File source : sources) {
+      decompiler.addSource(source);
     }
-    for (File library : lstLibraries) {
-      decompiler.addSpace(library, false);
+    for (File library : libraries) {
+      decompiler.addLibrary(library);
     }
 
     decompiler.decompileContext();
   }
 
   @SuppressWarnings("UseOfSystemOutOrSystemErr")
-  private static void addPath(List<File> list, String path) {
+  private static void addPath(List<? super File> list, String path) {
     File file = new File(path);
     if (file.exists()) {
       list.add(file);
@@ -112,30 +98,29 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   // *******************************************************************
 
   private final File root;
-  private final Fernflower fernflower;
-  private final Map<String, ZipOutputStream> mapArchiveStreams = new HashMap<String, ZipOutputStream>();
-  private final Map<String, Set<String>> mapArchiveEntries = new HashMap<String, Set<String>>();
-
-  @SuppressWarnings("UseOfSystemOutOrSystemErr")
-  public ConsoleDecompiler(File destination, Map<String, Object> options) {
-    this(destination, options, new PrintStreamLogger(System.out));
-  }
+  private final Fernflower engine;
+  private final Map<String, ZipOutputStream> mapArchiveStreams = new HashMap<>();
+  private final Map<String, Set<String>> mapArchiveEntries = new HashMap<>();
 
   protected ConsoleDecompiler(File destination, Map<String, Object> options, IFernflowerLogger logger) {
     root = destination;
-    fernflower = new Fernflower(this, this, options, logger);
+    engine = new Fernflower(this, this, options, logger);
   }
 
-  public void addSpace(File file, boolean isOwn) {
-    fernflower.getStructContext().addSpace(file, isOwn);
+  public void addSource(File source) {
+    engine.addSource(source);
+  }
+
+  public void addLibrary(File library) {
+    engine.addLibrary(library);
   }
 
   public void decompileContext() {
     try {
-      fernflower.decompileContext();
+      engine.decompileContext();
     }
     finally {
-      fernflower.clearContext();
+      engine.clearContext();
     }
   }
 
@@ -150,17 +135,11 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
       return InterpreterUtil.getBytes(file);
     }
     else {
-      ZipFile archive = new ZipFile(file);
-      try {
+      try (ZipFile archive = new ZipFile(file)) {
         ZipEntry entry = archive.getEntry(internalPath);
-        if (entry == null) {
-          throw new IOException("Entry not found: " + internalPath);
-        }
+        if (entry == null) throw new IOException("Entry not found: " + internalPath);
         return InterpreterUtil.getBytes(archive, entry);
       }
-      finally {
-        archive.close();
-      }
     }
   }
 
@@ -193,14 +172,8 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   @Override
   public void saveClassFile(String path, String qualifiedName, String entryName, String content, int[] mapping) {
     File file = new File(getAbsolutePath(path), entryName);
-    try {
-      Writer out = new OutputStreamWriter(new FileOutputStream(file), "UTF8");
-      try {
-        out.write(content);
-      }
-      finally {
-        out.close();
-      }
+    try (Writer out = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8)) {
+      out.write(content);
     }
     catch (IOException ex) {
       DecompilerContext.getLogger().writeMessage("Cannot write class file " + file, ex);
@@ -216,7 +189,6 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
       }
 
       FileOutputStream fileStream = new FileOutputStream(file);
-      @SuppressWarnings("IOResourceOpenedButNotSafelyClosed")
       ZipOutputStream zipStream = manifest != null ? new JarOutputStream(fileStream, manifest) : new ZipOutputStream(fileStream);
       mapArchiveStreams.put(file.getPath(), zipStream);
     }
@@ -238,21 +210,15 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
       return;
     }
 
-    try {
-      ZipFile srcArchive = new ZipFile(new File(source));
-      try {
-        ZipEntry entry = srcArchive.getEntry(entryName);
-        if (entry != null) {
-          InputStream in = srcArchive.getInputStream(entry);
+    try (ZipFile srcArchive = new ZipFile(new File(source))) {
+      ZipEntry entry = srcArchive.getEntry(entryName);
+      if (entry != null) {
+        try (InputStream in = srcArchive.getInputStream(entry)) {
           ZipOutputStream out = mapArchiveStreams.get(file);
           out.putNextEntry(new ZipEntry(entryName));
           InterpreterUtil.copyStream(in, out);
-          in.close();
         }
       }
-      finally {
-        srcArchive.close();
-      }
     }
     catch (IOException ex) {
       String message = "Cannot copy entry " + entryName + " from " + source + " to " + file;
@@ -272,7 +238,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
       ZipOutputStream out = mapArchiveStreams.get(file);
       out.putNextEntry(new ZipEntry(entryName));
       if (content != null) {
-        out.write(content.getBytes("UTF-8"));
+        out.write(content.getBytes(StandardCharsets.UTF_8));
       }
     }
     catch (IOException ex) {
@@ -282,10 +248,7 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
   }
 
   private boolean checkEntry(String entryName, String file) {
-    Set<String> set = mapArchiveEntries.get(file);
-    if (set == null) {
-      mapArchiveEntries.put(file, set = new HashSet<String>());
-    }
+    Set<String> set = mapArchiveEntries.computeIfAbsent(file, k -> new HashSet<>());
 
     boolean added = set.add(entryName);
     if (!added) {
@@ -306,4 +269,4 @@ public class ConsoleDecompiler implements IBytecodeProvider, IResultSaver {
       DecompilerContext.getLogger().writeMessage("Cannot close " + file, IFernflowerLogger.Severity.WARN);
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java b/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
index 0995613..ff3b9b3 100644
--- a/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
+++ b/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java
@@ -1,22 +1,8 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.decompiler;
 
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
-import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.io.PrintStream;
 
@@ -33,14 +19,14 @@ public class PrintStreamLogger extends IFernflowerLogger {
   @Override
   public void writeMessage(String message, Severity severity) {
     if (accepts(severity)) {
-      stream.println(severity.prefix + InterpreterUtil.getIndentString(indent) + message);
+      stream.println(severity.prefix + TextUtil.getIndentString(indent) + message);
     }
   }
 
   @Override
-  public void writeMessage(String message, Throwable t) {
-    if (accepts(Severity.ERROR)) {
-      writeMessage(message, Severity.ERROR);
+  public void writeMessage(String message, Severity severity, Throwable t) {
+    if (accepts(severity)) {
+      writeMessage(message, severity);
       t.printStackTrace(stream);
     }
   }
@@ -85,6 +71,7 @@ public class PrintStreamLogger extends IFernflowerLogger {
     }
   }
 
+  @Override
   public void endMethod() {
     if (accepts(Severity.INFO)) {
       --indent;
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IBytecodeProvider.java b/src/org/jetbrains/java/decompiler/main/extern/IBytecodeProvider.java
index adf3270..ac72d7c 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IBytecodeProvider.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IBytecodeProvider.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.extern;
 
 import java.io.IOException;
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
index db76c77..c9ece03 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.extern;
 
 public abstract class IFernflowerLogger {
@@ -39,7 +25,11 @@ public abstract class IFernflowerLogger {
 
   public abstract void writeMessage(String message, Severity severity);
 
-  public abstract void writeMessage(String message, Throwable t);
+  public abstract void writeMessage(String message, Severity severity, Throwable t);
+
+  public void writeMessage(String message, Throwable t) {
+    writeMessage(message, Severity.ERROR, t);
+  }
 
   public void startReadingClass(String className) { }
 
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
index 31871c5..5448e79 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.extern;
 
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
@@ -31,6 +17,7 @@ public interface IFernflowerPreferences {
   String HIDE_DEFAULT_CONSTRUCTOR = "hdc";
   String DECOMPILE_GENERIC_SIGNATURES = "dgs";
   String NO_EXCEPTIONS_RETURN = "ner";
+  String ENSURE_SYNCHRONIZED_MONITOR = "esm";
   String DECOMPILE_ENUM = "den";
   String REMOVE_GET_CLASS_NEW = "rgn";
   String LITERALS_AS_IS = "lit";
@@ -39,12 +26,14 @@ public interface IFernflowerPreferences {
   String SYNTHETIC_NOT_SET = "nns";
   String UNDEFINED_PARAM_TYPE_OBJECT = "uto";
   String USE_DEBUG_VAR_NAMES = "udv";
+  String USE_METHOD_PARAMETERS = "ump";
   String REMOVE_EMPTY_RANGES = "rer";
   String FINALLY_DEINLINE = "fdi";
   String IDEA_NOT_NULL_ANNOTATION = "inn";
   String LAMBDA_TO_ANONYMOUS_CLASS = "lac";
   String BYTECODE_SOURCE_MAPPING = "bsm";
-  String USE_DEBUG_LINE_NUMBERS = "udl";
+  String IGNORE_INVALID_BYTECODE = "iib";
+  String VERIFY_ANONYMOUS_CLASSES = "vac";
 
   String LOG_LEVEL = "log";
   String MAX_PROCESSING_METHOD = "mpm";
@@ -58,40 +47,49 @@ public interface IFernflowerPreferences {
   String UNIT_TEST_MODE = "__unit_test_mode__";
 
   String LINE_SEPARATOR_WIN = "\r\n";
-  String LINE_SEPARATOR_LIN = "\n";
+  String LINE_SEPARATOR_UNX = "\n";
 
-  Map<String, Object> DEFAULTS = Collections.unmodifiableMap(new HashMap<String, Object>() {{
-    put(REMOVE_BRIDGE, "1");
-    put(REMOVE_SYNTHETIC, "0");
-    put(DECOMPILE_INNER, "1");
-    put(DECOMPILE_CLASS_1_4, "1");
-    put(DECOMPILE_ASSERTIONS, "1");
-    put(HIDE_EMPTY_SUPER, "1");
-    put(HIDE_DEFAULT_CONSTRUCTOR, "1");
-    put(DECOMPILE_GENERIC_SIGNATURES, "0");
-    put(NO_EXCEPTIONS_RETURN, "1");
-    put(DECOMPILE_ENUM, "1");
-    put(REMOVE_GET_CLASS_NEW, "1");
-    put(LITERALS_AS_IS, "0");
-    put(BOOLEAN_TRUE_ONE, "1");
-    put(ASCII_STRING_CHARACTERS, "0");
-    put(SYNTHETIC_NOT_SET, "1");
-    put(UNDEFINED_PARAM_TYPE_OBJECT, "1");
-    put(USE_DEBUG_VAR_NAMES, "1");
-    put(REMOVE_EMPTY_RANGES, "1");
-    put(FINALLY_DEINLINE, "1");
-    put(IDEA_NOT_NULL_ANNOTATION, "1");
-    put(LAMBDA_TO_ANONYMOUS_CLASS, "0");
-    put(BYTECODE_SOURCE_MAPPING, "0");
-    put(USE_DEBUG_LINE_NUMBERS, "0");
+  Map<String, Object> DEFAULTS = getDefaults();
 
-    put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
-    put(MAX_PROCESSING_METHOD, "0");
-    put(RENAME_ENTITIES, "0");
-    put(NEW_LINE_SEPARATOR, (InterpreterUtil.IS_WINDOWS ? "0" : "1"));
-    put(INDENT_STRING, "   ");
-    put(BANNER, "");
-    put(UNIT_TEST_MODE, "0");
-    put(DUMP_ORIGINAL_LINES, "0");
-  }});
-}
+  static Map<String, Object> getDefaults() {
+    Map<String, Object> defaults = new HashMap<>();
+
+    defaults.put(REMOVE_BRIDGE, "1");
+    defaults.put(REMOVE_SYNTHETIC, "0");
+    defaults.put(DECOMPILE_INNER, "1");
+    defaults.put(DECOMPILE_CLASS_1_4, "1");
+    defaults.put(DECOMPILE_ASSERTIONS, "1");
+    defaults.put(HIDE_EMPTY_SUPER, "1");
+    defaults.put(HIDE_DEFAULT_CONSTRUCTOR, "1");
+    defaults.put(DECOMPILE_GENERIC_SIGNATURES, "0");
+    defaults.put(NO_EXCEPTIONS_RETURN, "1");
+    defaults.put(ENSURE_SYNCHRONIZED_MONITOR, "1");
+    defaults.put(DECOMPILE_ENUM, "1");
+    defaults.put(REMOVE_GET_CLASS_NEW, "1");
+    defaults.put(LITERALS_AS_IS, "0");
+    defaults.put(BOOLEAN_TRUE_ONE, "1");
+    defaults.put(ASCII_STRING_CHARACTERS, "0");
+    defaults.put(SYNTHETIC_NOT_SET, "0");
+    defaults.put(UNDEFINED_PARAM_TYPE_OBJECT, "1");
+    defaults.put(USE_DEBUG_VAR_NAMES, "1");
+    defaults.put(USE_METHOD_PARAMETERS, "1");
+    defaults.put(REMOVE_EMPTY_RANGES, "1");
+    defaults.put(FINALLY_DEINLINE, "1");
+    defaults.put(IDEA_NOT_NULL_ANNOTATION, "1");
+    defaults.put(LAMBDA_TO_ANONYMOUS_CLASS, "0");
+    defaults.put(BYTECODE_SOURCE_MAPPING, "0");
+    defaults.put(IGNORE_INVALID_BYTECODE, "0");
+    defaults.put(VERIFY_ANONYMOUS_CLASSES, "0");
+
+    defaults.put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
+    defaults.put(MAX_PROCESSING_METHOD, "0");
+    defaults.put(RENAME_ENTITIES, "0");
+    defaults.put(NEW_LINE_SEPARATOR, (InterpreterUtil.IS_WINDOWS ? "0" : "1"));
+    defaults.put(INDENT_STRING, "   ");
+    defaults.put(BANNER, "");
+    defaults.put(UNIT_TEST_MODE, "0");
+    defaults.put(DUMP_ORIGINAL_LINES, "0");
+
+    return Collections.unmodifiableMap(defaults);
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IIdentifierRenamer.java b/src/org/jetbrains/java/decompiler/main/extern/IIdentifierRenamer.java
index 5513528..59d7be7 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IIdentifierRenamer.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IIdentifierRenamer.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.extern;
 
 public interface IIdentifierRenamer {
diff --git a/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java b/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java
index 269f1c5..fad1ddc 100644
--- a/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java
+++ b/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.extern;
 
 import java.util.jar.Manifest;
diff --git a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
index 18f05a3..ca63ad5 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.rels;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -22,62 +8,49 @@ import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
 import org.jetbrains.java.decompiler.struct.StructClass;
-import org.jetbrains.java.decompiler.struct.StructField;
 import org.jetbrains.java.decompiler.struct.StructMethod;
-import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
 import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.jetbrains.java.decompiler.util.VBStyleCollection;
 
-import java.io.IOException;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 public class ClassWrapper {
-
   private final StructClass classStruct;
-  private final Set<String> hiddenMembers = new HashSet<String>();
-  private final VBStyleCollection<Exprent, String> staticFieldInitializers = new VBStyleCollection<Exprent, String>();
-  private final VBStyleCollection<Exprent, String> dynamicFieldInitializers = new VBStyleCollection<Exprent, String>();
-  private final VBStyleCollection<MethodWrapper, String> methods = new VBStyleCollection<MethodWrapper, String>();
+  private final Set<String> hiddenMembers = new HashSet<>();
+  private final VBStyleCollection<Exprent, String> staticFieldInitializers = new VBStyleCollection<>();
+  private final VBStyleCollection<Exprent, String> dynamicFieldInitializers = new VBStyleCollection<>();
+  private final VBStyleCollection<MethodWrapper, String> methods = new VBStyleCollection<>();
 
   public ClassWrapper(StructClass classStruct) {
     this.classStruct = classStruct;
   }
 
-  public void init() throws IOException {
+  public void init() {
     DecompilerContext.setProperty(DecompilerContext.CURRENT_CLASS, classStruct);
     DecompilerContext.setProperty(DecompilerContext.CURRENT_CLASS_WRAPPER, this);
     DecompilerContext.getLogger().startClass(classStruct.qualifiedName);
 
-    // collect field names
-    Set<String> setFieldNames = new HashSet<String>();
-    for (StructField fd : classStruct.getFields()) {
-      setFieldNames.add(fd.getName());
-    }
-
     int maxSec = Integer.parseInt(DecompilerContext.getProperty(IFernflowerPreferences.MAX_PROCESSING_METHOD).toString());
     boolean testMode = DecompilerContext.getOption(IFernflowerPreferences.UNIT_TEST_MODE);
 
     for (StructMethod mt : classStruct.getMethods()) {
       DecompilerContext.getLogger().startMethod(mt.getName() + " " + mt.getDescriptor());
 
-      VarNamesCollector vc = new VarNamesCollector();
-      DecompilerContext.setVarNamesCollector(vc);
+      MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
+      VarProcessor varProc = new VarProcessor(mt, md);
+      DecompilerContext.startMethod(varProc);
 
-      CounterContainer counter = new CounterContainer();
-      DecompilerContext.setCounterContainer(counter);
-
-      DecompilerContext.setProperty(DecompilerContext.CURRENT_METHOD, mt);
-      DecompilerContext.setProperty(DecompilerContext.CURRENT_METHOD_DESCRIPTOR, MethodDescriptor.parseDescriptor(mt.getDescriptor()));
-
-      VarProcessor varProc = new VarProcessor();
-      DecompilerContext.setProperty(DecompilerContext.CURRENT_VAR_PROCESSOR, varProc);
+      VarNamesCollector vc = varProc.getVarNamesCollector();
+      CounterContainer counter = DecompilerContext.getCounterContainer();
 
       RootStatement root = null;
 
@@ -86,13 +59,13 @@ public class ClassWrapper {
       try {
         if (mt.containsCode()) {
           if (maxSec == 0 || testMode) {
-            root = MethodProcessorRunnable.codeToJava(mt, varProc);
+            root = MethodProcessorRunnable.codeToJava(mt, md, varProc);
           }
           else {
-            MethodProcessorRunnable mtProc = new MethodProcessorRunnable(mt, varProc, DecompilerContext.getCurrentContext());
+            MethodProcessorRunnable mtProc = new MethodProcessorRunnable(mt, md, varProc, DecompilerContext.getCurrentContext());
 
             Thread mtThread = new Thread(mtProc, "Java decompiler");
-            long stopAt = System.currentTimeMillis() + maxSec * 1000;
+            long stopAt = System.currentTimeMillis() + maxSec * 1000L;
 
             mtThread.start();
 
@@ -123,7 +96,6 @@ public class ClassWrapper {
         }
         else {
           boolean thisVar = !mt.hasModifier(CodeConstants.ACC_STATIC);
-          MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
 
           int paramCount = 0;
           if (thisVar) {
@@ -150,8 +122,9 @@ public class ClassWrapper {
           }
         }
       }
-      catch (Throwable ex) {
-        DecompilerContext.getLogger().writeMessage("Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be decompiled.", ex);
+      catch (Throwable t) {
+        String message = "Method " + mt.getName() + " " + mt.getDescriptor() + " couldn't be decompiled.";
+        DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN, t);
         isError = true;
       }
 
@@ -160,16 +133,35 @@ public class ClassWrapper {
 
       methods.addWithKey(methodWrapper, InterpreterUtil.makeUniqueKey(mt.getName(), mt.getDescriptor()));
 
-      // rename vars so that no one has the same name as a field
-      varProc.refreshVarNames(new VarNamesCollector(setFieldNames));
+      if (!isError) {
+        // rename vars so that no one has the same name as a field
+        VarNamesCollector namesCollector = new VarNamesCollector();
+        classStruct.getFields().forEach(f -> namesCollector.addName(f.getName()));
+        varProc.refreshVarNames(namesCollector);
 
-      // if debug information present and should be used
-      if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) {
-        StructLocalVariableTableAttribute attr = (StructLocalVariableTableAttribute)mt.getAttributes().getWithKey(
-          StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
+        // if debug information present and should be used
+        if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) {
+          StructLocalVariableTableAttribute attr = mt.getLocalVariableAttr();
+          if (attr != null) {
+            // only param names here
+            varProc.setDebugVarNames(attr.getMapParamNames());
 
-        if (attr != null) {
-          varProc.setDebugVarNames(attr.getMapVarNames());
+            // the rest is here
+            methodWrapper.getOrBuildGraph().iterateExprents(exprent -> {
+              List<Exprent> lst = exprent.getAllExprents(true);
+              lst.add(exprent);
+              lst.stream()
+                .filter(e -> e.type == Exprent.EXPRENT_VAR)
+                .forEach(e -> {
+                  VarExprent varExprent = (VarExprent)e;
+                  String name = varExprent.getDebugName(mt);
+                  if (name != null) {
+                    varProc.setVarName(varExprent.getVarVersionPair(), name);
+                  }
+                });
+              return 0;
+            });
+          }
         }
       }
 
@@ -207,4 +199,9 @@ public class ClassWrapper {
   public VBStyleCollection<Exprent, String> getDynamicFieldInitializers() {
     return dynamicFieldInitializers;
   }
-}
+
+  @Override
+  public String toString() {
+    return classStruct.qualifiedName;
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
index 0704efd..fd0f261 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.rels;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -44,21 +30,17 @@ public class LambdaProcessor {
       processClass(child);
     }
 
-    hasLambda(node);
-  }
-
-  public boolean hasLambda(ClassNode node) throws IOException {
     ClassesProcessor clProcessor = DecompilerContext.getClassProcessor();
     StructClass cl = node.classStruct;
 
     if (cl.getBytecodeVersion() < CodeConstants.BYTECODE_JAVA_8) { // lambda beginning with Java 8
-      return false;
+      return;
     }
 
     StructBootstrapMethodsAttribute bootstrap =
-      (StructBootstrapMethodsAttribute)cl.getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_BOOTSTRAP_METHODS);
+      cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_BOOTSTRAP_METHODS);
     if (bootstrap == null || bootstrap.getMethodsNumber() == 0) {
-      return false; // no bootstrap constants in pool
+      return; // no bootstrap constants in pool
     }
 
     BitSet lambda_methods = new BitSet();
@@ -75,10 +57,10 @@ public class LambdaProcessor {
     }
 
     if (lambda_methods.isEmpty()) {
-      return false; // no lambda bootstrap constant found
+      return; // no lambda bootstrap constant found
     }
 
-    Map<String, String> mapMethodsLambda = new HashMap<String, String>();
+    Map<String, String> mapMethodsLambda = new HashMap<>();
 
     // iterate over code and find invocations of bootstrap methods. Replace them with anonymous classes.
     for (StructMethod mt : cl.getMethods()) {
@@ -92,7 +74,7 @@ public class LambdaProcessor {
           Instruction instr = seq.getInstr(i);
 
           if (instr.opcode == CodeConstants.opc_invokedynamic) {
-            LinkConstant invoke_dynamic = cl.getPool().getLinkConstant(instr.getOperand(0));
+            LinkConstant invoke_dynamic = cl.getPool().getLinkConstant(instr.operand(0));
 
             if (lambda_methods.get(invoke_dynamic.index1)) { // lambda invocation found
 
@@ -115,7 +97,9 @@ public class LambdaProcessor {
               node_lambda.parent = node;
 
               clProcessor.getMapRootClasses().put(node_lambda.simpleName, node_lambda);
-              mapMethodsLambda.put(node_lambda.lambdaInformation.content_method_key, node_lambda.simpleName);
+              if (!node_lambda.lambdaInformation.is_method_reference) {
+                mapMethodsLambda.put(node_lambda.lambdaInformation.content_method_key, node_lambda.simpleName);
+              }
             }
           }
         }
@@ -138,7 +122,5 @@ public class LambdaProcessor {
     }
 
     // FIXME: mixed hierarchy?
-
-    return false;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
index 1c90fb6..726d747 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorRunnable.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.rels;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -29,14 +15,15 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructMethod;
+import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 
 import java.io.IOException;
 
 public class MethodProcessorRunnable implements Runnable {
-
   public final Object lock = new Object();
 
   private final StructMethod method;
+  private final MethodDescriptor methodDescriptor;
   private final VarProcessor varProc;
   private final DecompilerContext parentContext;
 
@@ -44,27 +31,27 @@ public class MethodProcessorRunnable implements Runnable {
   private volatile Throwable error;
   private volatile boolean finished = false;
 
-  public MethodProcessorRunnable(StructMethod method, VarProcessor varProc, DecompilerContext parentContext) {
+  public MethodProcessorRunnable(StructMethod method,
+                                 MethodDescriptor methodDescriptor,
+                                 VarProcessor varProc,
+                                 DecompilerContext parentContext) {
     this.method = method;
+    this.methodDescriptor = methodDescriptor;
     this.varProc = varProc;
     this.parentContext = parentContext;
   }
 
   @Override
   public void run() {
-    DecompilerContext.setCurrentContext(parentContext);
-
     error = null;
     root = null;
 
     try {
-      root = codeToJava(method, varProc);
+      DecompilerContext.setCurrentContext(parentContext);
+      root = codeToJava(method, methodDescriptor, varProc);
     }
-    catch (ThreadDeath ex) {
-      throw ex;
-    }
-    catch (Throwable ex) {
-      error = ex;
+    catch (Throwable t) {
+      error = t;
     }
     finally {
       DecompilerContext.setCurrentContext(null);
@@ -76,7 +63,7 @@ public class MethodProcessorRunnable implements Runnable {
     }
   }
 
-  public static RootStatement codeToJava(StructMethod mt, VarProcessor varProc) throws IOException {
+  public static RootStatement codeToJava(StructMethod mt, MethodDescriptor md, VarProcessor varProc) throws IOException {
     StructClass cl = mt.getClassStruct();
 
     boolean isInitializer = CodeConstants.CLINIT_NAME.equals(mt.getName()); // for now static initializer only
@@ -101,6 +88,11 @@ public class MethodProcessorRunnable implements Runnable {
       ExceptionDeobfuscator.removeEmptyRanges(graph);
     }
 
+    if (DecompilerContext.getOption(IFernflowerPreferences.ENSURE_SYNCHRONIZED_MONITOR)) {
+      // special case: search for 'synchronized' ranges w/o monitorexit instruction (as generated by Kotlin and Scala)
+      DeadCodeHelper.extendSynchronizedRangeToMonitorexit(graph);
+    }
+
     if (DecompilerContext.getOption(IFernflowerPreferences.NO_EXCEPTIONS_RETURN)) {
       // special case: single return instruction outside of a protected range
       DeadCodeHelper.incorporateValueReturns(graph);
@@ -115,11 +107,15 @@ public class MethodProcessorRunnable implements Runnable {
 
     if (ExceptionDeobfuscator.hasObfuscatedExceptions(graph)) {
       DecompilerContext.getLogger().writeMessage("Heavily obfuscated exception ranges found!", IFernflowerLogger.Severity.WARN);
+      if (!ExceptionDeobfuscator.handleMultipleEntryExceptionRanges(graph)) {
+        DecompilerContext.getLogger().writeMessage("Found multiple entry exception ranges which could not be splitted", IFernflowerLogger.Severity.WARN);
+      }
+      ExceptionDeobfuscator.insertDummyExceptionHandlerBlocks(graph, cl.getBytecodeVersion());
     }
 
     RootStatement root = DomHelper.parseGraph(graph);
 
-    FinallyProcessor fProc = new FinallyProcessor(varProc);
+    FinallyProcessor fProc = new FinallyProcessor(md, varProc);
     while (fProc.iterateGraph(mt, root, graph)) {
       root = DomHelper.parseGraph(graph);
     }
@@ -134,44 +130,31 @@ public class MethodProcessorRunnable implements Runnable {
 
     ClearStructHelper.clearStatements(root);
 
-    ExprProcessor proc = new ExprProcessor();
+    ExprProcessor proc = new ExprProcessor(md, varProc);
     proc.processStatement(root, cl);
 
     SequenceHelper.condenseSequences(root);
-    
-    while (true) {
-      StackVarsProcessor stackProc = new StackVarsProcessor();
+
+    StackVarsProcessor stackProc = new StackVarsProcessor();
+
+    do {
       stackProc.simplifyStackVars(root, mt, cl);
-
       varProc.setVarVersions(root);
-
-      if (!new PPandMMHelper().findPPandMM(root)) {
-        break;
-      }
     }
+    while (new PPandMMHelper().findPPandMM(root));
 
     while (true) {
       LabelHelper.cleanUpEdges(root);
 
-      while (true) {
+      do {
         MergeHelper.enhanceLoops(root);
-
-        if (LoopExtractHelper.extractLoops(root)) {
-          continue;
-        }
-
-        if (!IfHelper.mergeAllIfs(root)) {
-          break;
-        }
       }
+      while (LoopExtractHelper.extractLoops(root) || IfHelper.mergeAllIfs(root));
 
       if (DecompilerContext.getOption(IFernflowerPreferences.IDEA_NOT_NULL_ANNOTATION)) {
         if (IdeaNotNullHelper.removeHardcodedChecks(root, mt)) {
           SequenceHelper.condenseSequences(root);
-
-          StackVarsProcessor stackProc = new StackVarsProcessor();
           stackProc.simplifyStackVars(root, mt, cl);
-
           varProc.setVarVersions(root);
         }
       }
@@ -188,14 +171,14 @@ public class MethodProcessorRunnable implements Runnable {
       }
 
       // FIXME: !!
-      //			if(!EliminateLoopsHelper.eliminateLoops(root)) {
-      //				break;
-      //			}
+      //if(!EliminateLoopsHelper.eliminateLoops(root)) {
+      //  break;
+      //}
     }
 
     ExitHelper.removeRedundantReturns(root);
 
-    SecondaryFunctionsHelper.identifySecondaryFunctions(root);
+    SecondaryFunctionsHelper.identifySecondaryFunctions(root, varProc);
 
     varProc.setVarDefinitions(root);
 
@@ -217,4 +200,4 @@ public class MethodProcessorRunnable implements Runnable {
   public boolean isFinished() {
     return finished;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
index 0f44e42..51a768d 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.rels;
 
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
@@ -25,26 +11,19 @@ import org.jetbrains.java.decompiler.struct.StructMethod;
 
 import java.util.HashSet;
 import java.util.List;
-
+import java.util.Set;
 
 public class MethodWrapper {
-
   public final RootStatement root;
-
   public final VarProcessor varproc;
-
   public final StructMethod methodStruct;
-
   public final CounterContainer counter;
+  public final Set<String> setOuterVarNames = new HashSet<>();
 
   public DirectGraph graph;
-
-  public List<VarVersionPair> signatureFields;
-
+  public List<VarVersionPair> synthParameters;
   public boolean decompiledWithErrors;
 
-  public final HashSet<String> setOuterVarNames = new HashSet<String>();
-
   public MethodWrapper(RootStatement root, VarProcessor varproc, StructMethod methodStruct, CounterContainer counter) {
     this.root = root;
     this.varproc = varproc;
@@ -54,9 +33,13 @@ public class MethodWrapper {
 
   public DirectGraph getOrBuildGraph() {
     if (graph == null && root != null) {
-      FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
-      graph = flatthelper.buildDirectGraph(root);
+      graph = new FlattenStatementsHelper().buildDirectGraph(root);
     }
     return graph;
   }
-}
+
+  @Override
+  public String toString() {
+    return methodStruct.getName();
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
index 798010e..da17532 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.rels;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -34,6 +20,7 @@ import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructField;
 import org.jetbrains.java.decompiler.struct.StructMethod;
 import org.jetbrains.java.decompiler.struct.attr.StructEnclosingMethodAttribute;
+import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
@@ -42,10 +29,7 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class NestedClassProcessor {
-
-
   public void processClass(ClassNode root, ClassNode node) {
-
     // hide synthetic lambda content methods
     if (node.type == ClassNode.CLASS_LAMBDA && !node.lambdaInformation.is_method_reference) {
       ClassNode node_content = DecompilerContext.getClassProcessor().getMapRootClasses().get(node.classStruct.qualifiedName);
@@ -59,7 +43,6 @@ public class NestedClassProcessor {
     }
 
     if (node.type != ClassNode.CLASS_LAMBDA) {
-
       computeLocalVarsAndDefinitions(node);
 
       // for each local or anonymous class ensure not empty enclosing method
@@ -68,9 +51,9 @@ public class NestedClassProcessor {
 
     int nameless = 0, synthetics = 0;
     for (ClassNode child : node.nested) {
+      StructClass cl = child.classStruct;
       // ensure not-empty class name
       if ((child.type == ClassNode.CLASS_LOCAL || child.type == ClassNode.CLASS_MEMBER) && child.simpleName == null) {
-        StructClass cl = child.classStruct;
         if ((child.access & CodeConstants.ACC_SYNTHETIC) != 0 || cl.isSynthetic()) {
           child.simpleName = "SyntheticClass_" + (++synthetics);
         }
@@ -79,7 +62,6 @@ public class NestedClassProcessor {
           DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
           child.simpleName = "NamelessClass_" + (++nameless);
         }
-        child.namelessConstructorStub = !cl.hasModifier(CodeConstants.ACC_STATIC) && cl.getMethods().size() + cl.getFields().size() == 0;
       }
     }
 
@@ -90,8 +72,11 @@ public class NestedClassProcessor {
       else if (child.type != ClassNode.CLASS_MEMBER || (child.access & CodeConstants.ACC_STATIC) == 0) {
         insertLocalVars(node, child);
 
-        if (child.type == ClassNode.CLASS_LOCAL) {
-          setLocalClassDefinition(node.getWrapper().getMethods().getWithKey(child.enclosingMethod), child);
+        if (child.type == ClassNode.CLASS_LOCAL && child.enclosingMethod != null) {
+          MethodWrapper enclosingMethodWrapper = node.getWrapper().getMethods().getWithKey(child.enclosingMethod);
+          if(enclosingMethodWrapper != null) { // e.g. in case of switch-on-enum. FIXME: some proper handling of multiple enclosing classes 
+            setLocalClassDefinition(enclosingMethodWrapper, child);
+          }
         }
       }
     }
@@ -102,110 +87,101 @@ public class NestedClassProcessor {
   }
 
   private static void setLambdaVars(ClassNode parent, ClassNode child) {
-
     if (child.lambdaInformation.is_method_reference) { // method reference, no code and no parameters
       return;
     }
 
-    final MethodWrapper meth = parent.getWrapper().getMethods().getWithKey(child.lambdaInformation.content_method_key);
-    final MethodWrapper encmeth = parent.getWrapper().getMethods().getWithKey(child.enclosingMethod);
+    MethodWrapper method = parent.getWrapper().getMethods().getWithKey(child.lambdaInformation.content_method_key);
+    MethodWrapper enclosingMethod = parent.getWrapper().getMethods().getWithKey(child.enclosingMethod);
 
     MethodDescriptor md_lambda = MethodDescriptor.parseDescriptor(child.lambdaInformation.method_descriptor);
-    final MethodDescriptor md_content = MethodDescriptor.parseDescriptor(child.lambdaInformation.content_method_descriptor);
+    MethodDescriptor md_content = MethodDescriptor.parseDescriptor(child.lambdaInformation.content_method_descriptor);
 
-    final int vars_count = md_content.params.length - md_lambda.params.length;
-    //		if(vars_count < 0) { // should not happen, but just in case...
-    //			vars_count = 0;
-    //		}
+    int vars_count = md_content.params.length - md_lambda.params.length;
+    boolean is_static_lambda_content = child.lambdaInformation.is_content_method_static;
 
-    final boolean is_static_lambda_content = child.lambdaInformation.is_content_method_static;
+    String parent_class_name = parent.getWrapper().getClassStruct().qualifiedName;
+    String lambda_class_name = child.simpleName;
 
-    final String parent_class_name = parent.getWrapper().getClassStruct().qualifiedName;
-    final String lambda_class_name = child.simpleName;
-
-    final VarType lambda_class_type = new VarType(lambda_class_name, true);
+    VarType lambda_class_type = new VarType(lambda_class_name, true);
 
     // this pointer
     if (!is_static_lambda_content && DecompilerContext.getOption(IFernflowerPreferences.LAMBDA_TO_ANONYMOUS_CLASS)) {
-      meth.varproc.getThisVars().put(new VarVersionPair(0, 0), parent_class_name);
-      meth.varproc.setVarName(new VarVersionPair(0, 0), parent.simpleName + ".this");
+      method.varproc.getThisVars().put(new VarVersionPair(0, 0), parent_class_name);
+      method.varproc.setVarName(new VarVersionPair(0, 0), parent.simpleName + ".this");
     }
 
-    // local variables
-    DirectGraph graph = encmeth.getOrBuildGraph();
+    Map<VarVersionPair, String> mapNewNames = new HashMap<>();
 
-    final HashMap<VarVersionPair, String> mapNewNames = new HashMap<VarVersionPair, String>();
+    enclosingMethod.getOrBuildGraph().iterateExprents(exprent -> {
+      List<Exprent> lst = exprent.getAllExprents(true);
+      lst.add(exprent);
 
-    graph.iterateExprents(new DirectGraph.ExprentIterator() {
-      public int processExprent(Exprent exprent) {
+      for (Exprent expr : lst) {
+        if (expr.type == Exprent.EXPRENT_NEW) {
+          NewExprent new_expr = (NewExprent)expr;
 
-        List<Exprent> lst = exprent.getAllExprents(true);
-        lst.add(exprent);
+          VarNamesCollector enclosingCollector = new VarNamesCollector(enclosingMethod.varproc.getVarNames());
 
-        for (Exprent expr : lst) {
+          if (new_expr.isLambda() && lambda_class_type.equals(new_expr.getNewType())) {
+            InvocationExprent inv_dynamic = new_expr.getConstructor();
 
-          if (expr.type == Exprent.EXPRENT_NEW) {
-            NewExprent new_expr = (NewExprent)expr;
-            if (new_expr.isLambda() && lambda_class_type.equals(new_expr.getNewType())) {
-
-              InvocationExprent inv_dynamic = new_expr.getConstructor();
-
-              int param_index = is_static_lambda_content ? 0 : 1;
-              int varindex = is_static_lambda_content ? 0 : 1;
-
-              for (int i = 0; i < vars_count; ++i) {
+            int param_index = is_static_lambda_content ? 0 : 1;
+            int varIndex = is_static_lambda_content ? 0 : 1;
 
+            for (int i = 0; i < md_content.params.length; ++i) {
+              VarVersionPair varVersion = new VarVersionPair(varIndex, 0);
+              if (i < vars_count) {
                 Exprent param = inv_dynamic.getLstParameters().get(param_index + i);
 
                 if (param.type == Exprent.EXPRENT_VAR) {
-                  VarVersionPair enc_varpaar = new VarVersionPair((VarExprent)param);
-                  String enc_varname = encmeth.varproc.getVarName(enc_varpaar);
-
-                  //meth.varproc.setVarName(new VarVersionPair(varindex, 0), enc_varname);
-                  mapNewNames.put(new VarVersionPair(varindex, 0), enc_varname);
+                  mapNewNames.put(varVersion, enclosingMethod.varproc.getVarName(new VarVersionPair((VarExprent)param)));
                 }
-
-                varindex += md_content.params[i].stackSize;
               }
+              else {
+                mapNewNames.put(varVersion, enclosingCollector.getFreeName(method.varproc.getVarName(varVersion)));
+              }
+
+              varIndex += md_content.params[i].stackSize;
             }
           }
         }
-
-        return 0;
       }
+
+      return 0;
     });
 
     // update names of local variables
-    HashSet<String> setNewOuterNames = new HashSet<String>(mapNewNames.values());
-    setNewOuterNames.removeAll(meth.setOuterVarNames);
+    Set<String> setNewOuterNames = new HashSet<>(mapNewNames.values());
+    setNewOuterNames.removeAll(method.setOuterVarNames);
 
-    meth.varproc.refreshVarNames(new VarNamesCollector(setNewOuterNames));
-    meth.setOuterVarNames.addAll(setNewOuterNames);
+    method.varproc.refreshVarNames(new VarNamesCollector(setNewOuterNames));
+    method.setOuterVarNames.addAll(setNewOuterNames);
 
-    for (Entry<VarVersionPair, String> entr : mapNewNames.entrySet()) {
-      meth.varproc.setVarName(entr.getKey(), entr.getValue());
+    for (Entry<VarVersionPair, String> entry : mapNewNames.entrySet()) {
+      method.varproc.setVarName(entry.getKey(), entry.getValue());
     }
   }
 
   private static void checkNotFoundClasses(ClassNode root, ClassNode node) {
+    List<ClassNode> copy = new ArrayList<>(node.nested);
 
-    List<ClassNode> lstChildren = new ArrayList<ClassNode>(node.nested);
-
-    for (ClassNode child : lstChildren) {
+    for (ClassNode child : copy) {
+      if (child.classStruct.isSynthetic()) {
+        continue;
+      }
 
       if ((child.type == ClassNode.CLASS_LOCAL || child.type == ClassNode.CLASS_ANONYMOUS) && child.enclosingMethod == null) {
-
         Set<String> setEnclosing = child.enclosingClasses;
 
-        if (setEnclosing.size() == 1) {
-          StructEnclosingMethodAttribute attr =
-            (StructEnclosingMethodAttribute)child.classStruct.getAttributes().getWithKey("EnclosingMethod");
-          if (attr != null && attr.getMethodName() != null) {
-            if (node.classStruct.qualifiedName.equals(attr.getClassName()) &&
-                node.classStruct.getMethod(attr.getMethodName(), attr.getMethodDescriptor()) != null) {
-              child.enclosingMethod = InterpreterUtil.makeUniqueKey(attr.getMethodName(), attr.getMethodDescriptor());
-              continue;
-            }
+        if (!setEnclosing.isEmpty()) {
+          StructEnclosingMethodAttribute attr = child.classStruct.getAttribute(StructGeneralAttribute.ATTRIBUTE_ENCLOSING_METHOD);
+          if (attr != null &&
+              attr.getMethodName() != null &&
+              node.classStruct.qualifiedName.equals(attr.getClassName()) &&
+              node.classStruct.getMethod(attr.getMethodName(), attr.getMethodDescriptor()) != null) {
+            child.enclosingMethod = InterpreterUtil.makeUniqueKey(attr.getMethodName(), attr.getMethodDescriptor());
+            continue;
           }
         }
 
@@ -213,17 +189,12 @@ public class NestedClassProcessor {
         child.parent = null;
         setEnclosing.remove(node.classStruct.qualifiedName);
 
-        boolean hasEnclosing = !setEnclosing.isEmpty();
-        if (hasEnclosing) {
-          hasEnclosing = insertNestedClass(root, child);
-        }
+        boolean hasEnclosing = !setEnclosing.isEmpty() && insertNestedClass(root, child);
 
         if (!hasEnclosing) {
           if (child.type == ClassNode.CLASS_ANONYMOUS) {
-            if (!child.classStruct.hasModifier(CodeConstants.ACC_SYNTHETIC)) {
-              String message = "Unreferenced anonymous class " + child.classStruct.qualifiedName + "!";
-              DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
-            }
+            String message = "Unreferenced anonymous class " + child.classStruct.qualifiedName + "!";
+            DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
           }
           else if (child.type == ClassNode.CLASS_LOCAL) {
             String message = "Unreferenced local class " + child.classStruct.qualifiedName + "!";
@@ -235,14 +206,12 @@ public class NestedClassProcessor {
   }
 
   private static boolean insertNestedClass(ClassNode root, ClassNode child) {
-
     Set<String> setEnclosing = child.enclosingClasses;
 
-    LinkedList<ClassNode> stack = new LinkedList<ClassNode>();
+    LinkedList<ClassNode> stack = new LinkedList<>();
     stack.add(root);
 
     while (!stack.isEmpty()) {
-
       ClassNode node = stack.removeFirst();
 
       if (setEnclosing.contains(node.classStruct.qualifiedName)) {
@@ -259,330 +228,294 @@ public class NestedClassProcessor {
     return false;
   }
 
+  private static void computeLocalVarsAndDefinitions(ClassNode node) {
+    // class name -> constructor descriptor -> var to field link
+    Map<String, Map<String, List<VarFieldPair>>> mapVarMasks = new HashMap<>();
 
-  private static void computeLocalVarsAndDefinitions(final ClassNode node) {
-
-    // local var masks
-    // class name, constructor descriptor, field mask
-    final HashMap<String, HashMap<String, List<VarFieldPair>>> mapVarMasks = new HashMap<String, HashMap<String, List<VarFieldPair>>>();
-
-    int cltypes = 0;
+    int clTypes = 0;
 
     for (ClassNode nd : node.nested) {
-      if (nd.type != ClassNode.CLASS_LAMBDA) {
-        if ((nd.access & CodeConstants.ACC_STATIC) == 0 && (nd.access & CodeConstants.ACC_INTERFACE) == 0) {
+      if (nd.type != ClassNode.CLASS_LAMBDA &&
+          !nd.classStruct.isSynthetic() &&
+          (nd.access & CodeConstants.ACC_STATIC) == 0 &&
+          (nd.access & CodeConstants.ACC_INTERFACE) == 0) {
+        clTypes |= nd.type;
 
-          cltypes |= nd.type;
-
-          HashMap<String, List<VarFieldPair>> mask = getMaskLocalVars(nd.getWrapper());
-          if (mask.isEmpty()) {
-            if (!nd.classStruct.hasModifier(CodeConstants.ACC_SYNTHETIC)) {
-              String message = "Nested class " + nd.classStruct.qualifiedName + " has no constructor!";
-              DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
-            }
-          }
-          else {
-            mapVarMasks.put(nd.classStruct.qualifiedName, mask);
-          }
+        Map<String, List<VarFieldPair>> mask = getMaskLocalVars(nd.getWrapper());
+        if (mask.isEmpty()) {
+          String message = "Nested class " + nd.classStruct.qualifiedName + " has no constructor!";
+          DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
+        }
+        else {
+          mapVarMasks.put(nd.classStruct.qualifiedName, mask);
         }
       }
     }
 
     // local var masks
-    final HashMap<String, HashMap<String, List<VarFieldPair>>> mapVarFieldPairs =
-      new HashMap<String, HashMap<String, List<VarFieldPair>>>();
-
-    if (cltypes != ClassNode.CLASS_MEMBER) {
+    Map<String, Map<String, List<VarFieldPair>>> mapVarFieldPairs = new HashMap<>();
 
+    if (clTypes != ClassNode.CLASS_MEMBER) {
       // iterate enclosing class
-      for (final MethodWrapper meth : node.getWrapper().getMethods()) {
+      for (MethodWrapper method : node.getWrapper().getMethods()) {
+        if (method.root != null) { // neither abstract, nor native
+          method.getOrBuildGraph().iterateExprents(exprent -> {
+            List<Exprent> lst = exprent.getAllExprents(true);
+            lst.add(exprent);
 
-        if (meth.root != null) { // neither abstract, nor native
-          DirectGraph graph = meth.getOrBuildGraph();
+            for (Exprent expr : lst) {
+              if (expr.type == Exprent.EXPRENT_NEW) {
+                InvocationExprent constructor = ((NewExprent)expr).getConstructor();
 
-          graph.iterateExprents(new DirectGraph.ExprentIterator() {
-            public int processExprent(Exprent exprent) {
-              List<Exprent> lst = exprent.getAllExprents(true);
-              lst.add(exprent);
+                if (constructor != null && mapVarMasks.containsKey(constructor.getClassname())) { // non-static inner class constructor
+                  String refClassName = constructor.getClassname();
+                  ClassNode nestedClassNode = node.getClassNode(refClassName);
 
-              for (Exprent expr : lst) {
+                  if (nestedClassNode.type != ClassNode.CLASS_MEMBER) {
+                    List<VarFieldPair> mask = mapVarMasks.get(refClassName).get(constructor.getStringDescriptor());
 
-                if (expr.type == Exprent.EXPRENT_NEW) {
-                  InvocationExprent constr = ((NewExprent)expr).getConstructor();
-
-                  if (constr != null && mapVarMasks.containsKey(constr.getClassname())) { // non-static inner class constructor
-
-                    String refclname = constr.getClassname();
-
-                    ClassNode nestedClassNode = node.getClassNode(refclname);
-
-                    if (nestedClassNode.type != ClassNode.CLASS_MEMBER) {
-
-                      List<VarFieldPair> mask = mapVarMasks.get(refclname).get(constr.getStringDescriptor());
-
-                      if (!mapVarFieldPairs.containsKey(refclname)) {
-                        mapVarFieldPairs.put(refclname, new HashMap<String, List<VarFieldPair>>());
-                      }
-
-                      List<VarFieldPair> lstTemp = new ArrayList<VarFieldPair>();
-
-                      for (int i = 0; i < mask.size(); i++) {
-                        Exprent param = constr.getLstParameters().get(i);
-                        VarFieldPair pair = null;
-
-                        if (param.type == Exprent.EXPRENT_VAR && mask.get(i) != null) {
-                          VarVersionPair varpaar = new VarVersionPair((VarExprent)param);
-
-                          // FIXME: final flags of variables are wrong! Correct the entire final functionality.
-                          //													if(meth.varproc.getVarFinal(varpaar) != VarTypeProcessor.VAR_NON_FINAL) {
-                          pair = new VarFieldPair(mask.get(i).keyfield, varpaar);
-                          //													}
-                        }
-
-                        lstTemp.add(pair);
-                      }
-
-                      List<VarFieldPair> pairmask = mapVarFieldPairs.get(refclname).get(constr.getStringDescriptor());
-
-                      if (pairmask == null) {
-                        pairmask = lstTemp;
-                      }
-                      else {
-                        for (int i = 0; i < pairmask.size(); i++) {
-                          if (!InterpreterUtil.equalObjects(pairmask.get(i), lstTemp.get(i))) {
-                            pairmask.set(i, null);
-                          }
-                        }
-                      }
-
-                      mapVarFieldPairs.get(refclname).put(constr.getStringDescriptor(), pairmask);
-                      nestedClassNode.enclosingMethod =
-                        InterpreterUtil.makeUniqueKey(meth.methodStruct.getName(), meth.methodStruct.getDescriptor());
+                    if (!mapVarFieldPairs.containsKey(refClassName)) {
+                      mapVarFieldPairs.put(refClassName, new HashMap<>());
                     }
+
+                    List<VarFieldPair> lstTemp = new ArrayList<>();
+
+                    for (int i = 0; i < mask.size(); i++) {
+                      Exprent param = constructor.getLstParameters().get(i);
+                      VarFieldPair pair = null;
+
+                      if (param.type == Exprent.EXPRENT_VAR && mask.get(i) != null) {
+                        VarVersionPair varPair = new VarVersionPair((VarExprent)param);
+
+                        // FIXME: flags of variables are wrong! Correct the entire functionality.
+                        // if(method.varproc.getVarFinal(varPair) != VarTypeProcessor.VAR_NON_FINAL) {
+                        pair = new VarFieldPair(mask.get(i).fieldKey, varPair);
+                        // }
+                      }
+
+                      lstTemp.add(pair);
+                    }
+
+                    List<VarFieldPair> pairMask = mapVarFieldPairs.get(refClassName).get(constructor.getStringDescriptor());
+                    if (pairMask == null) {
+                      pairMask = lstTemp;
+                    }
+                    else {
+                      for (int i = 0; i < pairMask.size(); i++) {
+                        if (!InterpreterUtil.equalObjects(pairMask.get(i), lstTemp.get(i))) {
+                          pairMask.set(i, null);
+                        }
+                      }
+                    }
+
+                    mapVarFieldPairs.get(refClassName).put(constructor.getStringDescriptor(), pairMask);
+                    nestedClassNode.enclosingMethod =
+                      InterpreterUtil.makeUniqueKey(method.methodStruct.getName(), method.methodStruct.getDescriptor());
                   }
                 }
               }
-              return 0;
             }
+
+            return 0;
           });
         }
       }
     }
 
     // merge var masks
-    for (Entry<String, HashMap<String, List<VarFieldPair>>> entcl : mapVarMasks.entrySet()) {
-
-      ClassNode nestedNode = node.getClassNode(entcl.getKey());
+    for (Entry<String, Map<String, List<VarFieldPair>>> enclosing : mapVarMasks.entrySet()) {
+      ClassNode nestedNode = node.getClassNode(enclosing.getKey());
 
       // intersection
-      List<VarFieldPair> intrPairMask = null;
+      List<VarFieldPair> interPairMask = null;
       // merge referenced constructors
-      if (mapVarFieldPairs.containsKey(entcl.getKey())) {
-        for (List<VarFieldPair> mask : mapVarFieldPairs.get(entcl.getKey()).values()) {
-          if (intrPairMask == null) {
-            intrPairMask = new ArrayList<VarFieldPair>(mask);
+      if (mapVarFieldPairs.containsKey(enclosing.getKey())) {
+        for (List<VarFieldPair> mask : mapVarFieldPairs.get(enclosing.getKey()).values()) {
+          if (interPairMask == null) {
+            interPairMask = new ArrayList<>(mask);
           }
           else {
-            mergeListSignatures(intrPairMask, mask, false);
+            mergeListSignatures(interPairMask, mask, false);
           }
         }
       }
 
-      List<VarFieldPair> intrMask = null;
+      List<VarFieldPair> interMask = null;
       // merge all constructors
-      for (List<VarFieldPair> mask : entcl.getValue().values()) {
-        if (intrMask == null) {
-          intrMask = new ArrayList<VarFieldPair>(mask);
+      for (List<VarFieldPair> mask : enclosing.getValue().values()) {
+        if (interMask == null) {
+          interMask = new ArrayList<>(mask);
         }
         else {
-          mergeListSignatures(intrMask, mask, false);
+          mergeListSignatures(interMask, mask, false);
         }
       }
 
-      if (intrPairMask == null) { // member or local and never instantiated
-        intrPairMask = new ArrayList<VarFieldPair>(intrMask);
+      if (interPairMask == null) { // member or local and never instantiated
+        interPairMask = interMask != null ? new ArrayList<>(interMask) : new ArrayList<>();
 
         boolean found = false;
 
-        for (int i = 0; i < intrPairMask.size(); i++) {
-          if (intrPairMask.get(i) != null) {
+        for (int i = 0; i < interPairMask.size(); i++) {
+          if (interPairMask.get(i) != null) {
             if (found) {
-              intrPairMask.set(i, null);
+              interPairMask.set(i, null);
             }
             found = true;
           }
         }
       }
 
-      mergeListSignatures(intrPairMask, intrMask, true);
+      mergeListSignatures(interPairMask, interMask, true);
 
-      for (int i = 0; i < intrPairMask.size(); i++) {
-        VarFieldPair pair = intrPairMask.get(i);
-        if (pair != null && pair.keyfield.length() > 0) {
-          nestedNode.mapFieldsToVars.put(pair.keyfield, pair.varpaar);
+      for (VarFieldPair pair : interPairMask) {
+        if (pair != null && !pair.fieldKey.isEmpty()) {
+          nestedNode.mapFieldsToVars.put(pair.fieldKey, pair.varPair);
         }
       }
 
       // set resulting constructor signatures
-      for (Entry<String, List<VarFieldPair>> entmt : entcl.getValue().entrySet()) {
-        mergeListSignatures(entmt.getValue(), intrPairMask, false);
+      for (Entry<String, List<VarFieldPair>> entry : enclosing.getValue().entrySet()) {
+        mergeListSignatures(entry.getValue(), interPairMask, false);
 
-        MethodWrapper meth = nestedNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, entmt.getKey());
-        meth.signatureFields = new ArrayList<VarVersionPair>();
-
-        for (VarFieldPair pair : entmt.getValue()) {
-          meth.signatureFields.add(pair == null ? null : pair.varpaar);
+        List<VarVersionPair> mask = new ArrayList<>(entry.getValue().size());
+        for (VarFieldPair pair : entry.getValue()) {
+          mask.add(pair != null && !pair.fieldKey.isEmpty() ? pair.varPair : null);
         }
+        nestedNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, entry.getKey()).synthParameters = mask;
       }
     }
   }
 
-  private static void insertLocalVars(final ClassNode parent, final ClassNode child) {
-
+  private static void insertLocalVars(ClassNode parent, ClassNode child) {
     // enclosing method, is null iff member class
-    MethodWrapper encmeth = parent.getWrapper().getMethods().getWithKey(child.enclosingMethod);
+    MethodWrapper enclosingMethod = parent.getWrapper().getMethods().getWithKey(child.enclosingMethod);
 
     // iterate all child methods
-    for (final MethodWrapper meth : child.getWrapper().getMethods()) {
+    for (MethodWrapper method : child.getWrapper().getMethods()) {
+      if (method.root != null) { // neither abstract nor native
+        Map<VarVersionPair, String> mapNewNames = new HashMap<>();  // local var names
+        Map<VarVersionPair, VarType> mapNewTypes = new HashMap<>();  // local var types
 
-      if (meth.root != null) { // neither abstract nor native
+        Map<Integer, VarVersionPair> mapParamsToNewVars = new HashMap<>();
+        if (method.synthParameters != null) {
+          int index = 0, varIndex = 1;
+          MethodDescriptor md = MethodDescriptor.parseDescriptor(method.methodStruct.getDescriptor());
 
-        // local var names
-        HashMap<VarVersionPair, String> mapNewNames = new HashMap<VarVersionPair, String>();
-        // local var types
-        HashMap<VarVersionPair, VarType> mapNewTypes = new HashMap<VarVersionPair, VarType>();
+          for (VarVersionPair pair : method.synthParameters) {
+            if (pair != null) {
+              VarVersionPair newVar = new VarVersionPair(method.counter.getCounterAndIncrement(CounterContainer.VAR_COUNTER), 0);
 
-        final HashMap<Integer, VarVersionPair> mapParamsToNewVars = new HashMap<Integer, VarVersionPair>();
-        if (meth.signatureFields != null) {
-          int index = 0;
-          int varindex = 1;
-          MethodDescriptor md = MethodDescriptor.parseDescriptor(meth.methodStruct.getDescriptor());
+              mapParamsToNewVars.put(varIndex, newVar);
 
-          for (VarVersionPair paar : meth.signatureFields) {
-            if (paar != null) {
-              VarVersionPair newvar = new VarVersionPair(meth.counter.getCounterAndIncrement(CounterContainer.VAR_COUNTER), 0);
-
-              mapParamsToNewVars.put(varindex, newvar);
-
-              String varname = null;
-              VarType vartype = null;
+              String varName = null;
+              VarType varType = null;
 
               if (child.type != ClassNode.CLASS_MEMBER) {
-                varname = encmeth.varproc.getVarName(paar);
-                vartype = encmeth.varproc.getVarType(paar);
+                varName = enclosingMethod.varproc.getVarName(pair);
+                varType = enclosingMethod.varproc.getVarType(pair);
 
-                encmeth.varproc.setVarFinal(paar, VarTypeProcessor.VAR_EXPLICIT_FINAL);
+                enclosingMethod.varproc.setVarFinal(pair, VarTypeProcessor.VAR_EXPLICIT_FINAL);
               }
 
-              if (paar.var == -1 || "this".equals(varname)) {
+              if (pair.var == -1 || "this".equals(varName)) {
                 if (parent.simpleName == null) {
                   // anonymous enclosing class, no access to this
-                  varname = VarExprent.VAR_NAMELESS_ENCLOSURE;
+                  varName = VarExprent.VAR_NAMELESS_ENCLOSURE;
                 }
                 else {
-                  varname = parent.simpleName + ".this";
+                  varName = parent.simpleName + ".this";
                 }
-                meth.varproc.getThisVars().put(newvar, parent.classStruct.qualifiedName);
+                method.varproc.getThisVars().put(newVar, parent.classStruct.qualifiedName);
               }
 
-              mapNewNames.put(newvar, varname);
-              mapNewTypes.put(newvar, vartype);
+              mapNewNames.put(newVar, varName);
+              mapNewTypes.put(newVar, varType);
             }
-            varindex += md.params[index++].stackSize;
+
+            varIndex += md.params[index++].stackSize;
           }
         }
 
-        // new vars
-        final HashMap<String, VarVersionPair> mapFieldsToNewVars = new HashMap<String, VarVersionPair>();
+        Map<String, VarVersionPair> mapFieldsToNewVars = new HashMap<>();
+        for (ClassNode classNode = child; classNode != null; classNode = classNode.parent) {
+          for (Entry<String, VarVersionPair> entry : classNode.mapFieldsToVars.entrySet()) {
+            VarVersionPair newVar = new VarVersionPair(method.counter.getCounterAndIncrement(CounterContainer.VAR_COUNTER), 0);
 
-        for (ClassNode clnode = child; clnode != null; clnode = clnode.parent) {
+            mapFieldsToNewVars.put(InterpreterUtil.makeUniqueKey(classNode.classStruct.qualifiedName, entry.getKey()), newVar);
 
-          for (Entry<String, VarVersionPair> entr : clnode.mapFieldsToVars.entrySet()) {
-            VarVersionPair newvar = new VarVersionPair(meth.counter.getCounterAndIncrement(CounterContainer.VAR_COUNTER), 0);
+            String varName = null;
+            VarType varType = null;
 
-            mapFieldsToNewVars.put(InterpreterUtil.makeUniqueKey(clnode.classStruct.qualifiedName, entr.getKey()), newvar);
+            if (classNode.type != ClassNode.CLASS_MEMBER) {
+              MethodWrapper enclosing_method = classNode.parent.getWrapper().getMethods().getWithKey(classNode.enclosingMethod);
 
-            String varname = null;
-            VarType vartype = null;
+              varName = enclosing_method.varproc.getVarName(entry.getValue());
+              varType = enclosing_method.varproc.getVarType(entry.getValue());
 
-            if (clnode.type != ClassNode.CLASS_MEMBER) {
-
-              MethodWrapper enclosing_method = clnode.parent.getWrapper().getMethods().getWithKey(clnode.enclosingMethod);
-
-              varname = enclosing_method.varproc.getVarName(entr.getValue());
-              vartype = enclosing_method.varproc.getVarType(entr.getValue());
-
-              enclosing_method.varproc.setVarFinal(entr.getValue(), VarTypeProcessor.VAR_EXPLICIT_FINAL);
+              enclosing_method.varproc.setVarFinal(entry.getValue(), VarTypeProcessor.VAR_EXPLICIT_FINAL);
             }
 
-            if (entr.getValue().var == -1 || "this".equals(varname)) {
-              if (clnode.parent.simpleName == null) {
+            if (entry.getValue().var == -1 || "this".equals(varName)) {
+              if (classNode.parent.simpleName == null) {
                 // anonymous enclosing class, no access to this
-                varname = VarExprent.VAR_NAMELESS_ENCLOSURE;
+                varName = VarExprent.VAR_NAMELESS_ENCLOSURE;
               }
               else {
-                varname = clnode.parent.simpleName + ".this";
+                varName = classNode.parent.simpleName + ".this";
               }
-              meth.varproc.getThisVars().put(newvar, clnode.parent.classStruct.qualifiedName);
+              method.varproc.getThisVars().put(newVar, classNode.parent.classStruct.qualifiedName);
             }
 
-            mapNewNames.put(newvar, varname);
-            mapNewTypes.put(newvar, vartype);
+            mapNewNames.put(newVar, varName);
+            mapNewTypes.put(newVar, varType);
 
             // hide synthetic field
-            if (clnode == child) { // fields higher up the chain were already handled with their classes
-              StructField fd = child.classStruct.getFields().getWithKey(entr.getKey());
+            if (classNode == child) { // fields higher up the chain were already handled with their classes
+              StructField fd = child.classStruct.getFields().getWithKey(entry.getKey());
               child.getWrapper().getHiddenMembers().add(InterpreterUtil.makeUniqueKey(fd.getName(), fd.getDescriptor()));
             }
           }
         }
 
-        HashSet<String> setNewOuterNames = new HashSet<String>(mapNewNames.values());
-        setNewOuterNames.removeAll(meth.setOuterVarNames);
+        Set<String> setNewOuterNames = new HashSet<>(mapNewNames.values());
+        setNewOuterNames.removeAll(method.setOuterVarNames);
 
-        meth.varproc.refreshVarNames(new VarNamesCollector(setNewOuterNames));
-        meth.setOuterVarNames.addAll(setNewOuterNames);
+        method.varproc.refreshVarNames(new VarNamesCollector(setNewOuterNames));
+        method.setOuterVarNames.addAll(setNewOuterNames);
 
-        for (Entry<VarVersionPair, String> entr : mapNewNames.entrySet()) {
-          VarVersionPair varpaar = entr.getKey();
-          VarType vartype = mapNewTypes.get(varpaar);
+        for (Entry<VarVersionPair, String> entry : mapNewNames.entrySet()) {
+          VarVersionPair pair = entry.getKey();
+          VarType type = mapNewTypes.get(pair);
 
-          meth.varproc.setVarName(varpaar, entr.getValue());
-          if (vartype != null) {
-            meth.varproc.setVarType(varpaar, vartype);
+          method.varproc.setVarName(pair, entry.getValue());
+          if (type != null) {
+            method.varproc.setVarType(pair, type);
           }
         }
 
-        DirectGraph graph = meth.getOrBuildGraph();
-
-        graph.iterateExprents(new DirectGraph.ExprentIterator() {
+        method.getOrBuildGraph().iterateExprents(new DirectGraph.ExprentIterator() {
+          @Override
           public int processExprent(Exprent exprent) {
-
             if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-              AssignmentExprent asexpr = (AssignmentExprent)exprent;
-              if (asexpr.getLeft().type == Exprent.EXPRENT_FIELD) {
-                FieldExprent fexpr = (FieldExprent)asexpr.getLeft();
-
-                if (fexpr.getClassname().equals(child.classStruct.qualifiedName) &&  // process this class only
-                    mapFieldsToNewVars.containsKey(InterpreterUtil.makeUniqueKey(child.classStruct.qualifiedName,
-                                                                                 InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr
-                                                                                   .getDescriptor().descriptorString)))) {
+              AssignmentExprent assignExpr = (AssignmentExprent)exprent;
+              if (assignExpr.getLeft().type == Exprent.EXPRENT_FIELD) {
+                FieldExprent fExpr = (FieldExprent)assignExpr.getLeft();
+                String qName = child.classStruct.qualifiedName;
+                if (fExpr.getClassname().equals(qName) &&  // process this class only
+                    mapFieldsToNewVars.containsKey(InterpreterUtil.makeUniqueKey(qName, fExpr.getName(), fExpr.getDescriptor().descriptorString))) {
                   return 2;
                 }
-
-                //if(fexpr.getClassname().equals(child.classStruct.qualifiedName) &&
-                //		mapFieldsToNewVars.containsKey(InterpreterUtil.makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString))) {
-                //	return 2;
-                //}
               }
             }
 
-            if (child.type == ClassNode.CLASS_ANONYMOUS && CodeConstants.INIT_NAME.equals(meth.methodStruct.getName())
-                && exprent.type == Exprent.EXPRENT_INVOCATION) {
-              InvocationExprent invexpr = (InvocationExprent)exprent;
-              if (invexpr.getFunctype() == InvocationExprent.TYP_INIT) {
+            if (child.type == ClassNode.CLASS_ANONYMOUS &&
+                CodeConstants.INIT_NAME.equals(method.methodStruct.getName()) &&
+                exprent.type == Exprent.EXPRENT_INVOCATION) {
+              InvocationExprent invokeExpr = (InvocationExprent)exprent;
+              if (invokeExpr.getFunctype() == InvocationExprent.TYP_INIT) {
                 // invocation of the super constructor in an anonymous class
-                child.superInvocation = invexpr; // FIXME: save original names of parameters
+                child.superInvocation = invokeExpr; // FIXME: save original names of parameters
                 return 2;
               }
             }
@@ -593,27 +526,23 @@ public class NestedClassProcessor {
           }
 
           private Exprent replaceExprent(Exprent exprent) {
-
             if (exprent.type == Exprent.EXPRENT_VAR) {
-              int varindex = ((VarExprent)exprent).getIndex();
-              if (mapParamsToNewVars.containsKey(varindex)) {
-                VarVersionPair newvar = mapParamsToNewVars.get(varindex);
-                meth.varproc.getExternalVars().add(newvar);
-                return new VarExprent(newvar.var, meth.varproc.getVarType(newvar), meth.varproc);
+              int varIndex = ((VarExprent)exprent).getIndex();
+              if (mapParamsToNewVars.containsKey(varIndex)) {
+                VarVersionPair newVar = mapParamsToNewVars.get(varIndex);
+                method.varproc.getExternalVars().add(newVar);
+                return new VarExprent(newVar.var, method.varproc.getVarType(newVar), method.varproc);
               }
             }
             else if (exprent.type == Exprent.EXPRENT_FIELD) {
-              FieldExprent fexpr = (FieldExprent)exprent;
-
-              String keyField = InterpreterUtil.makeUniqueKey(fexpr.getClassname(), InterpreterUtil
-                .makeUniqueKey(fexpr.getName(), fexpr.getDescriptor().descriptorString));
-
-              if (mapFieldsToNewVars.containsKey(keyField)) {
-                //if(fexpr.getClassname().equals(child.classStruct.qualifiedName) &&
-                //		mapFieldsToNewVars.containsKey(keyField)) {
-                VarVersionPair newvar = mapFieldsToNewVars.get(keyField);
-                meth.varproc.getExternalVars().add(newvar);
-                return new VarExprent(newvar.var, meth.varproc.getVarType(newvar), meth.varproc);
+              FieldExprent fExpr = (FieldExprent)exprent;
+              String key = InterpreterUtil.makeUniqueKey(fExpr.getClassname(), fExpr.getName(), fExpr.getDescriptor().descriptorString);
+              if (mapFieldsToNewVars.containsKey(key)) {
+                //if(fExpr.getClassname().equals(child.classStruct.qualifiedName) &&
+                //		mapFieldsToNewVars.containsKey(key)) {
+                VarVersionPair newVar = mapFieldsToNewVars.get(key);
+                method.varproc.getExternalVars().add(newVar);
+                return new VarExprent(newVar.var, method.varproc.getVarType(newVar), method.varproc);
               }
             }
 
@@ -622,9 +551,9 @@ public class NestedClassProcessor {
               replaced = false;
 
               for (Exprent expr : exprent.getAllExprents()) {
-                Exprent retexpr = replaceExprent(expr);
-                if (retexpr != null) {
-                  exprent.replaceExprent(expr, retexpr);
+                Exprent retExpr = replaceExprent(expr);
+                if (retExpr != null) {
+                  exprent.replaceExprent(expr, retExpr);
                   replaced = true;
                   break;
                 }
@@ -638,30 +567,28 @@ public class NestedClassProcessor {
     }
   }
 
-  private static HashMap<String, List<VarFieldPair>> getMaskLocalVars(ClassWrapper wrapper) {
-
-    HashMap<String, List<VarFieldPair>> mapMasks = new HashMap<String, List<VarFieldPair>>();
+  private static Map<String, List<VarFieldPair>> getMaskLocalVars(ClassWrapper wrapper) {
+    Map<String, List<VarFieldPair>> mapMasks = new HashMap<>();
 
     StructClass cl = wrapper.getClassStruct();
 
     // iterate over constructors
     for (StructMethod mt : cl.getMethods()) {
       if (CodeConstants.INIT_NAME.equals(mt.getName())) {
-
         MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
-
-        MethodWrapper meth = wrapper.getMethodWrapper(CodeConstants.INIT_NAME, mt.getDescriptor());
-        DirectGraph graph = meth.getOrBuildGraph();
+        MethodWrapper method = wrapper.getMethodWrapper(CodeConstants.INIT_NAME, mt.getDescriptor());
+        DirectGraph graph = method.getOrBuildGraph();
 
         if (graph != null) { // something gone wrong, should not be null
-          List<VarFieldPair> fields = new ArrayList<VarFieldPair>();
+          List<VarFieldPair> fields = new ArrayList<>(md.params.length);
 
-          int varindex = 1;
+          int varIndex = 1;
           for (int i = 0; i < md.params.length; i++) {  // no static methods allowed
-            String keyField = getEnclosingVarField(cl, meth, graph, varindex);
+            String keyField = getEnclosingVarField(cl, method, graph, varIndex);
             fields.add(keyField == null ? null : new VarFieldPair(keyField, new VarVersionPair(-1, 0))); // TODO: null?
-            varindex += md.params[i].stackSize;
+            varIndex += md.params[i].stackSize;
           }
+
           mapMasks.put(mt.getDescriptor(), fields);
         }
       }
@@ -670,38 +597,34 @@ public class NestedClassProcessor {
     return mapMasks;
   }
 
-  private static String getEnclosingVarField(StructClass cl, MethodWrapper meth, DirectGraph graph, final int index) {
-
+  private static String getEnclosingVarField(StructClass cl, MethodWrapper method, DirectGraph graph, int index) {
     String field = "";
 
     // parameter variable final
-    if (meth.varproc.getVarFinal(new VarVersionPair(index, 0)) == VarTypeProcessor.VAR_NON_FINAL) {
+    if (method.varproc.getVarFinal(new VarVersionPair(index, 0)) == VarTypeProcessor.VAR_NON_FINAL) {
       return null;
     }
 
     boolean noSynthFlag = DecompilerContext.getOption(IFernflowerPreferences.SYNTHETIC_NOT_SET);
 
     // no loop at the begin
-    DirectNode firstnode = graph.first;
-    if (firstnode.preds.isEmpty()) {
-      // assignment to a final synthetic field?
-      for (Exprent exprent : firstnode.exprents) {
+    DirectNode firstNode = graph.first;
+    if (firstNode.preds.isEmpty()) {
+      // assignment to a synthetic field?
+      for (Exprent exprent : firstNode.exprents) {
         if (exprent.type == Exprent.EXPRENT_ASSIGNMENT) {
-          AssignmentExprent asexpr = (AssignmentExprent)exprent;
-          if (asexpr.getRight().type == Exprent.EXPRENT_VAR && ((VarExprent)asexpr.getRight()).getIndex() == index) {
-            if (asexpr.getLeft().type == Exprent.EXPRENT_FIELD) {
-
-              FieldExprent left = (FieldExprent)asexpr.getLeft();
-              StructField fd = cl.getField(left.getName(), left.getDescriptor().descriptorString);
-
-              if (fd != null) { // local (== not inherited) field
-                if (cl.qualifiedName.equals(left.getClassname()) &&
-                    fd.hasModifier(CodeConstants.ACC_FINAL) &&
-                    (fd.isSynthetic() || (noSynthFlag && fd.hasModifier(CodeConstants.ACC_PRIVATE)))) {
-                  field = InterpreterUtil.makeUniqueKey(left.getName(), left.getDescriptor().descriptorString);
-                  break;
-                }
-              }
+          AssignmentExprent assignExpr = (AssignmentExprent)exprent;
+          if (assignExpr.getRight().type == Exprent.EXPRENT_VAR &&
+              ((VarExprent)assignExpr.getRight()).getIndex() == index &&
+              assignExpr.getLeft().type == Exprent.EXPRENT_FIELD) {
+            FieldExprent left = (FieldExprent)assignExpr.getLeft();
+            StructField fd = cl.getField(left.getName(), left.getDescriptor().descriptorString);
+            if (fd != null &&
+                cl.qualifiedName.equals(left.getClassname()) &&
+                (fd.isSynthetic() || noSynthFlag && possiblySyntheticField(fd))) {
+              // local (== not inherited) field
+              field = InterpreterUtil.makeUniqueKey(left.getName(), left.getDescriptor().descriptorString);
+              break;
             }
           }
         }
@@ -711,52 +634,32 @@ public class NestedClassProcessor {
     return field;
   }
 
+  private static boolean possiblySyntheticField(StructField fd) {
+    return fd.getName().contains("$") && fd.hasModifier(CodeConstants.ACC_FINAL) && fd.hasModifier(CodeConstants.ACC_PRIVATE);
+  }
+
   private static void mergeListSignatures(List<VarFieldPair> first, List<VarFieldPair> second, boolean both) {
-
     int i = 1;
-    while (true) {
-      if (first.size() <= i || second.size() <= i) {
-        break;
-      }
 
-      VarFieldPair fobj = first.get(first.size() - i);
-      VarFieldPair sobj = second.get(second.size() - i);
+    while (first.size() > i && second.size() > i) {
+      VarFieldPair fObj = first.get(first.size() - i);
+      VarFieldPair sObj = second.get(second.size() - i);
 
-      boolean eq = false;
-      if (fobj == null || sobj == null) {
-        eq = (fobj == sobj);
-      }
-      else {
-        eq = true;
-        if (fobj.keyfield.length() == 0) {
-          fobj.keyfield = sobj.keyfield;
-        }
-        else if (sobj.keyfield.length() == 0) {
-          if (both) {
-            sobj.keyfield = fobj.keyfield;
-          }
-        }
-        else {
-          eq = fobj.keyfield.equals(sobj.keyfield);
-        }
-      }
-
-      if (!eq) {
+      if (!isEqual(both, fObj, sObj)) {
         first.set(first.size() - i, null);
         if (both) {
           second.set(second.size() - i, null);
         }
       }
-      else {
-        if (fobj != null) {
-          if (fobj.varpaar.var == -1) {
-            fobj.varpaar = sobj.varpaar;
-          }
-          else {
-            sobj.varpaar = fobj.varpaar;
-          }
+      else if (fObj != null) {
+        if (fObj.varPair.var == -1) {
+          fObj.varPair = sObj.varPair;
+        }
+        else {
+          sObj.varPair = fObj.varPair;
         }
       }
+
       i++;
     }
 
@@ -780,64 +683,65 @@ public class NestedClassProcessor {
       first.set(0, null);
     }
     else {
-      VarFieldPair fobj = first.get(0);
-      VarFieldPair sobj = second.get(0);
+      VarFieldPair fObj = first.get(0);
+      VarFieldPair sObj = second.get(0);
 
-      boolean eq = false;
-      if (fobj == null || sobj == null) {
-        eq = (fobj == sobj);
-      }
-      else {
-        eq = true;
-        if (fobj.keyfield.length() == 0) {
-          fobj.keyfield = sobj.keyfield;
-        }
-        else if (sobj.keyfield.length() == 0) {
-          if (both) {
-            sobj.keyfield = fobj.keyfield;
-          }
-        }
-        else {
-          eq = fobj.keyfield.equals(sobj.keyfield);
-        }
-      }
-
-      if (!eq) {
+      if (!isEqual(both, fObj, sObj)) {
         first.set(0, null);
         if (both) {
           second.set(0, null);
         }
       }
-      else if (fobj != null) {
-        if (fobj.varpaar.var == -1) {
-          fobj.varpaar = sobj.varpaar;
+      else if (fObj != null) {
+        if (fObj.varPair.var == -1) {
+          fObj.varPair = sObj.varPair;
         }
         else {
-          sobj.varpaar = fobj.varpaar;
+          sObj.varPair = fObj.varPair;
         }
       }
     }
   }
 
+  private static boolean isEqual(boolean both, VarFieldPair fObj, VarFieldPair sObj) {
+    boolean eq;
+    if (fObj == null || sObj == null) {
+      eq = (fObj == sObj);
+    }
+    else {
+      eq = true;
+      if (fObj.fieldKey.length() == 0) {
+        fObj.fieldKey = sObj.fieldKey;
+      }
+      else if (sObj.fieldKey.length() == 0) {
+        if (both) {
+          sObj.fieldKey = fObj.fieldKey;
+        }
+      }
+      else {
+        eq = fObj.fieldKey.equals(sObj.fieldKey);
+      }
+    }
+    return eq;
+  }
 
-  private static void setLocalClassDefinition(MethodWrapper meth, ClassNode node) {
+  private static void setLocalClassDefinition(MethodWrapper method, ClassNode node) {
+    RootStatement root = method.root;
 
-    RootStatement root = meth.root;
+    Set<Statement> setStats = new HashSet<>();
+    VarType classType = new VarType(node.classStruct.qualifiedName, true);
 
-    HashSet<Statement> setStats = new HashSet<Statement>();
-    VarType classtype = new VarType(node.classStruct.qualifiedName, true);
-
-    Statement stdef = getDefStatement(root, classtype, setStats);
-    if (stdef == null) {
+    Statement statement = getDefStatement(root, classType, setStats);
+    if (statement == null) {
       // unreferenced local class
-      stdef = root.getFirst();
+      statement = root.getFirst();
     }
 
-    Statement first = findFirstBlock(stdef, setStats);
+    Statement first = findFirstBlock(statement, setStats);
 
     List<Exprent> lst;
     if (first == null) {
-      lst = stdef.getVarDefinitions();
+      lst = statement.getVarDefinitions();
     }
     else if (first.getExprents() == null) {
       lst = first.getVarDefinitions();
@@ -846,57 +750,47 @@ public class NestedClassProcessor {
       lst = first.getExprents();
     }
 
-
-    int addindex = 0;
+    int addIndex = 0;
     for (Exprent expr : lst) {
-      if (searchForClass(expr, classtype)) {
+      if (searchForClass(expr, classType)) {
         break;
       }
-      addindex++;
+      addIndex++;
     }
 
-    VarExprent var = new VarExprent(meth.counter.getCounterAndIncrement(CounterContainer.VAR_COUNTER),
-                                    classtype, meth.varproc);
+    VarExprent var = new VarExprent(method.counter.getCounterAndIncrement(CounterContainer.VAR_COUNTER), classType, method.varproc);
     var.setDefinition(true);
     var.setClassDef(true);
 
-    lst.add(addindex, var);
+    lst.add(addIndex, var);
   }
 
-
-  private static Statement findFirstBlock(Statement stat, HashSet<Statement> setStats) {
-
-    LinkedList<Statement> stack = new LinkedList<Statement>();
+  private static Statement findFirstBlock(Statement stat, Set<Statement> setStats) {
+    LinkedList<Statement> stack = new LinkedList<>();
     stack.add(stat);
 
     while (!stack.isEmpty()) {
       Statement st = stack.remove(0);
 
       if (stack.isEmpty() || setStats.contains(st)) {
-
-        if (st.isLabeled() && !stack.isEmpty()) {
+        if (st.isLabeled() && !stack.isEmpty() || st.getExprents() != null) {
           return st;
         }
 
-        if (st.getExprents() != null) {
-          return st;
-        }
-        else {
-          stack.clear();
+        stack.clear();
 
-          switch (st.type) {
-            case Statement.TYPE_SEQUENCE:
-              stack.addAll(0, st.getStats());
-              break;
-            case Statement.TYPE_IF:
-            case Statement.TYPE_ROOT:
-            case Statement.TYPE_SWITCH:
-            case Statement.TYPE_SYNCRONIZED:
-              stack.add(st.getFirst());
-              break;
-            default:
-              return st;
-          }
+        switch (st.type) {
+          case Statement.TYPE_SEQUENCE:
+            stack.addAll(0, st.getStats());
+            break;
+          case Statement.TYPE_IF:
+          case Statement.TYPE_ROOT:
+          case Statement.TYPE_SWITCH:
+          case Statement.TYPE_SYNCRONIZED:
+            stack.add(st.getFirst());
+            break;
+          default:
+            return st;
         }
       }
     }
@@ -904,11 +798,9 @@ public class NestedClassProcessor {
     return null;
   }
 
-
-  private static Statement getDefStatement(Statement stat, VarType classtype, HashSet<Statement> setStats) {
-
-    List<Exprent> condlst = new ArrayList<Exprent>();
-    Statement retstat = null;
+  private static Statement getDefStatement(Statement stat, VarType classType, Set<? super Statement> setStats) {
+    List<Exprent> lst = new ArrayList<>();
+    Statement retStat = null;
 
     if (stat.getExprents() == null) {
       int counter = 0;
@@ -917,65 +809,63 @@ public class NestedClassProcessor {
         if (obj instanceof Statement) {
           Statement st = (Statement)obj;
 
-          Statement stTemp = getDefStatement(st, classtype, setStats);
+          Statement stTemp = getDefStatement(st, classType, setStats);
 
           if (stTemp != null) {
             if (counter == 1) {
-              retstat = stat;
+              retStat = stat;
               break;
             }
-            retstat = stTemp;
+            retStat = stTemp;
             counter++;
           }
 
-          if (st.type == DoStatement.TYPE_DO) {
+          if (st.type == Statement.TYPE_DO) {
             DoStatement dost = (DoStatement)st;
 
-            condlst.addAll(dost.getInitExprentList());
-            condlst.addAll(dost.getConditionExprentList());
+            lst.addAll(dost.getInitExprentList());
+            lst.addAll(dost.getConditionExprentList());
           }
         }
         else if (obj instanceof Exprent) {
-          condlst.add((Exprent)obj);
+          lst.add((Exprent)obj);
         }
       }
     }
     else {
-      condlst = stat.getExprents();
+      lst = stat.getExprents();
     }
 
-    if (retstat != stat) {
-      for (Exprent exprent : condlst) {
-        if (exprent != null && searchForClass(exprent, classtype)) {
-          retstat = stat;
+    if (retStat != stat) {
+      for (Exprent exprent : lst) {
+        if (exprent != null && searchForClass(exprent, classType)) {
+          retStat = stat;
           break;
         }
       }
     }
 
-    if (retstat != null) {
+    if (retStat != null) {
       setStats.add(stat);
     }
 
-    return retstat;
+    return retStat;
   }
 
-  private static boolean searchForClass(Exprent exprent, VarType classtype) {
-
+  private static boolean searchForClass(Exprent exprent, VarType classType) {
     List<Exprent> lst = exprent.getAllExprents(true);
     lst.add(exprent);
 
-    String classname = classtype.value;
+    String classname = classType.value;
 
     for (Exprent expr : lst) {
-
       boolean res = false;
 
       switch (expr.type) {
         case Exprent.EXPRENT_CONST:
-          ConstExprent cexpr = (ConstExprent)expr;
-          res = (VarType.VARTYPE_CLASS.equals(cexpr.getConstType()) && classname.equals(cexpr.getValue()) ||
-                 classtype.equals(cexpr.getConstType()));
+          ConstExprent constExpr = (ConstExprent)expr;
+          res = (VarType.VARTYPE_CLASS.equals(constExpr.getConstType()) && classname.equals(constExpr.getValue()) ||
+                 classType.equals(constExpr.getConstType()));
           break;
         case Exprent.EXPRENT_FIELD:
           res = classname.equals(((FieldExprent)expr).getClassname());
@@ -988,10 +878,10 @@ public class NestedClassProcessor {
           res = newType.type == CodeConstants.TYPE_OBJECT && classname.equals(newType.value);
           break;
         case Exprent.EXPRENT_VAR:
-          VarExprent vexpr = (VarExprent)expr;
-          if (vexpr.isDefinition()) {
-            VarType vtype = vexpr.getVarType();
-            if (classtype.equals(vtype) || (vtype.arrayDim > 0 && classtype.value.equals(vtype.value))) {
+          VarExprent varExpr = (VarExprent)expr;
+          if (varExpr.isDefinition()) {
+            VarType varType = varExpr.getVarType();
+            if (classType.equals(varType) || (varType.arrayDim > 0 && classType.value.equals(varType.value))) {
               res = true;
             }
           }
@@ -1005,29 +895,27 @@ public class NestedClassProcessor {
     return false;
   }
 
-
   private static class VarFieldPair {
+    public String fieldKey;
+    public VarVersionPair varPair;
 
-    public String keyfield = "";
-    public VarVersionPair varpaar;
-
-    public VarFieldPair(String field, VarVersionPair varpaar) {
-      this.keyfield = field;
-      this.varpaar = varpaar;
+    VarFieldPair(String field, VarVersionPair varPair) {
+      this.fieldKey = field;
+      this.varPair = varPair;
     }
 
     @Override
     public boolean equals(Object o) {
       if (o == this) return true;
-      if (o == null || !(o instanceof VarFieldPair)) return false;
+      if (!(o instanceof VarFieldPair)) return false;
 
       VarFieldPair pair = (VarFieldPair)o;
-      return keyfield.equals(pair.keyfield) && varpaar.equals(pair.varpaar);
+      return fieldKey.equals(pair.fieldKey) && varPair.equals(pair.varPair);
     }
 
     @Override
     public int hashCode() {
-      return keyfield.hashCode() + varpaar.hashCode();
+      return fieldKey.hashCode() + varPair.hashCode();
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
index 3fa8128..692a8b9 100644
--- a/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
+++ b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.rels;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -29,20 +15,14 @@ import org.jetbrains.java.decompiler.struct.StructMethod;
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Map;
+import java.util.*;
 
 public class NestedMemberAccess {
 
-  private static final int METHOD_ACCESS_NORMAL = 1;
-  private static final int METHOD_ACCESS_FIELD_GET = 2;
-  private static final int METHOD_ACCESS_FIELD_SET = 3;
-  private static final int METHOD_ACCESS_METHOD = 4;
+  private enum MethodAccess {NORMAL, FIELD_GET, FIELD_SET, METHOD, FUNCTION}
 
   private boolean noSynthFlag;
-  private final Map<MethodWrapper, Integer> mapMethodType = new HashMap<MethodWrapper, Integer>();
+  private final Map<MethodWrapper, MethodAccess> mapMethodType = new HashMap<>();
 
 
   public void propagateMemberAccess(ClassNode root) {
@@ -73,7 +53,7 @@ public class NestedMemberAccess {
   }
 
   private void computeMethodType(ClassNode node, MethodWrapper method) {
-    int type = METHOD_ACCESS_NORMAL;
+    MethodAccess type = MethodAccess.NORMAL;
 
     if (method.root != null) {
       DirectGraph graph = method.getOrBuildGraph();
@@ -104,7 +84,7 @@ public class NestedMemberAccess {
                   if (fexpr.getClassname().equals(node.classStruct.qualifiedName)) {  // FIXME: check for private flag of the field
                     if (fexpr.isStatic() ||
                         (fexpr.getInstance().type == Exprent.EXPRENT_VAR && ((VarExprent)fexpr.getInstance()).getIndex() == 0)) {
-                      type = METHOD_ACCESS_FIELD_GET;
+                      type = MethodAccess.FIELD_GET;
                     }
                   }
                 }
@@ -113,13 +93,23 @@ public class NestedMemberAccess {
                 if (parcount == 1) {
                   // this or final variable
                   if (((VarExprent)exprCore).getIndex() != 0) {
-                    type = METHOD_ACCESS_FIELD_GET;
+                    type = MethodAccess.FIELD_GET;
                   }
                 }
 
+                break;
+              case Exprent.EXPRENT_FUNCTION:
+                // for now detect only increment/decrement
+                FunctionExprent functionExprent = (FunctionExprent)exprCore;
+                if (functionExprent.getFuncType() >= FunctionExprent.FUNCTION_IMM &&
+                    functionExprent.getFuncType() <= FunctionExprent.FUNCTION_PPI) {
+                  if (functionExprent.getLstOperands().get(0).type == Exprent.EXPRENT_FIELD) {
+                    type = MethodAccess.FUNCTION;
+                  }
+                }
                 break;
               case Exprent.EXPRENT_INVOCATION:
-                type = METHOD_ACCESS_METHOD;
+                type = MethodAccess.METHOD;
                 break;
               case Exprent.EXPRENT_ASSIGNMENT:
                 AssignmentExprent asexpr = (AssignmentExprent)exprCore;
@@ -131,7 +121,7 @@ public class NestedMemberAccess {
                       if (fexpras.isStatic() ||
                           (fexpras.getInstance().type == Exprent.EXPRENT_VAR && ((VarExprent)fexpras.getInstance()).getIndex() == 0)) {
                         if (((VarExprent)asexpr.getRight()).getIndex() == parcount - 1) {
-                          type = METHOD_ACCESS_FIELD_SET;
+                          type = MethodAccess.FIELD_SET;
                         }
                       }
                     }
@@ -139,30 +129,31 @@ public class NestedMemberAccess {
                 }
             }
 
+            if (type == MethodAccess.METHOD) { // FIXME: check for private flag of the method
 
-            if (type == METHOD_ACCESS_METHOD) { // FIXME: check for private flag of the method
-
-              type = METHOD_ACCESS_NORMAL;
+              type = MethodAccess.NORMAL;
 
               InvocationExprent invexpr = (InvocationExprent)exprCore;
 
-              if ((invexpr.isStatic() && invexpr.getLstParameters().size() == parcount) ||
-                  (!invexpr.isStatic() && invexpr.getInstance().type == Exprent.EXPRENT_VAR
+              boolean isStatic = invexpr.isStatic();
+              if ((isStatic && invexpr.getLstParameters().size() == parcount) ||
+                  (!isStatic && invexpr.getInstance().type == Exprent.EXPRENT_VAR
                    && ((VarExprent)invexpr.getInstance()).getIndex() == 0 && invexpr.getLstParameters().size() == parcount - 1)) {
 
                 boolean equalpars = true;
 
+                int index = isStatic ? 0 : 1;
                 for (int i = 0; i < invexpr.getLstParameters().size(); i++) {
                   Exprent parexpr = invexpr.getLstParameters().get(i);
-                  if (parexpr.type != Exprent.EXPRENT_VAR ||
-                      ((VarExprent)parexpr).getIndex() != i + (invexpr.isStatic() ? 0 : 1)) {
+                  if (parexpr.type != Exprent.EXPRENT_VAR || ((VarExprent)parexpr).getIndex() != index) {
                     equalpars = false;
                     break;
                   }
+                  index += mtdesc.params[i + (isStatic ? 0 : 1)].stackSize;
                 }
 
                 if (equalpars) {
-                  type = METHOD_ACCESS_METHOD;
+                  type = MethodAccess.METHOD;
                 }
               }
             }
@@ -191,7 +182,7 @@ public class NestedMemberAccess {
                         if (exexpr.getExitType() == ExitExprent.EXIT_RETURN && exexpr.getValue() != null) {
                           if (exexpr.getValue().type == Exprent.EXPRENT_VAR &&
                               ((VarExprent)asexpr.getRight()).getIndex() == parcount - 1) {
-                            type = METHOD_ACCESS_FIELD_SET;
+                            type = MethodAccess.FIELD_SET;
                           }
                         }
                       }
@@ -205,7 +196,7 @@ public class NestedMemberAccess {
       }
     }
 
-    if (type != METHOD_ACCESS_NORMAL) {
+    if (type != MethodAccess.NORMAL) {
       mapMethodType.put(method, type);
     }
     else {
@@ -228,8 +219,8 @@ public class NestedMemberAccess {
 
         DirectGraph graph = meth.getOrBuildGraph();
 
-        HashSet<DirectNode> setVisited = new HashSet<DirectNode>();
-        LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
+        HashSet<DirectNode> setVisited = new HashSet<>();
+        LinkedList<DirectNode> stack = new LinkedList<>();
         stack.add(graph.first);
 
         while (!stack.isEmpty()) {  // TODO: replace with interface iterator?
@@ -256,9 +247,7 @@ public class NestedMemberAccess {
             }
           }
 
-          for (DirectNode ndx : nd.succs) {
-            stack.add(ndx);
-          }
+          stack.addAll(nd.succs);
         }
 
         if (replaced) {
@@ -323,7 +312,6 @@ public class NestedMemberAccess {
   }
 
   private Exprent replaceAccessExprent(ClassNode caller, MethodWrapper methdest, InvocationExprent invexpr) {
-
     ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(invexpr.getClassname());
 
     MethodWrapper methsource = null;
@@ -343,10 +331,10 @@ public class NestedMemberAccess {
       return null;
     }
 
-    int type = mapMethodType.get(methsource);
+    MethodAccess type = mapMethodType.get(methsource);
 
-    //		// FIXME: impossible case. METHOD_ACCESS_NORMAL is not saved in the map
-    //		if(type == METHOD_ACCESS_NORMAL) {
+    //		// FIXME: impossible case. MethodAccess.NORMAL is not saved in the map
+    //		if(type == MethodAccess.NORMAL) {
     //			return null;
     //		}
 
@@ -360,7 +348,7 @@ public class NestedMemberAccess {
     Exprent retexprent = null;
 
     switch (type) {
-      case METHOD_ACCESS_FIELD_GET:
+      case FIELD_GET:
         ExitExprent exsource = (ExitExprent)source;
         if (exsource.getValue().type == Exprent.EXPRENT_VAR) { // qualified this
           VarExprent var = (VarExprent)exsource.getValue();
@@ -388,7 +376,7 @@ public class NestedMemberAccess {
           retexprent = ret;
         }
         break;
-      case METHOD_ACCESS_FIELD_SET:
+      case FIELD_SET:
         AssignmentExprent ret;
         if (source.type == Exprent.EXPRENT_EXIT) {
           ExitExprent extex = (ExitExprent)source;
@@ -406,9 +394,17 @@ public class NestedMemberAccess {
           ret.replaceExprent(ret.getRight(), invexpr.getLstParameters().get(1));
           fexpr.replaceExprent(fexpr.getInstance(), invexpr.getLstParameters().get(0));
         }
+
+        // do not use copied bytecodes
+        ret.getLeft().bytecode = null;
+        ret.getRight().bytecode = null;
+
         retexprent = ret;
         break;
-      case METHOD_ACCESS_METHOD:
+      case FUNCTION:
+        retexprent = replaceFunction(invexpr, source);
+        break;
+      case METHOD:
         if (source.type == Exprent.EXPRENT_EXIT) {
           source = ((ExitExprent)source).getValue();
         }
@@ -430,6 +426,10 @@ public class NestedMemberAccess {
 
 
     if (retexprent != null) {
+      // preserve original bytecodes
+      retexprent.bytecode = null;
+      retexprent.addBytecodeOffsets(invexpr.bytecode);
+
       // hide synthetic access method
       boolean hide = true;
 
@@ -446,4 +446,25 @@ public class NestedMemberAccess {
 
     return retexprent;
   }
+
+  private static Exprent replaceFunction(final InvocationExprent invexpr, final Exprent source) {
+    FunctionExprent functionExprent = (FunctionExprent)((ExitExprent)source).getValue().copy();
+
+    List<Exprent> lstParameters = invexpr.getLstParameters();
+
+    FieldExprent fieldExprent = (FieldExprent)functionExprent.getLstOperands().get(0);
+    if (fieldExprent.isStatic()) {
+      if (!lstParameters.isEmpty()) {
+        return null;
+      }
+      return functionExprent;
+    }
+
+    if (lstParameters.size() != 1) {
+      return null;
+    }
+
+    fieldExprent.replaceExprent(fieldExprent.getInstance(), lstParameters.get(0));
+    return functionExprent;
+  }
 }
diff --git a/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java b/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
index d79367f..9d28d0e 100644
--- a/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
@@ -1,23 +1,10 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.code;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.code.Instruction;
 import org.jetbrains.java.decompiler.code.InstructionSequence;
+import org.jetbrains.java.decompiler.code.SimpleInstructionSequence;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph;
 import org.jetbrains.java.decompiler.code.cfg.ExceptionRangeCFG;
@@ -30,8 +17,8 @@ public class DeadCodeHelper {
 
   public static void removeDeadBlocks(ControlFlowGraph graph) {
 
-    LinkedList<BasicBlock> stack = new LinkedList<BasicBlock>();
-    HashSet<BasicBlock> setStacked = new HashSet<BasicBlock>();
+    LinkedList<BasicBlock> stack = new LinkedList<>();
+    HashSet<BasicBlock> setStacked = new HashSet<>();
 
     stack.add(graph.getFirst());
     setStacked.add(graph.getFirst());
@@ -39,7 +26,7 @@ public class DeadCodeHelper {
     while (!stack.isEmpty()) {
       BasicBlock block = stack.removeFirst();
 
-      List<BasicBlock> lstSuccs = new ArrayList<BasicBlock>(block.getSuccs());
+      List<BasicBlock> lstSuccs = new ArrayList<>(block.getSuccs());
       lstSuccs.addAll(block.getSuccExceptions());
 
       for (BasicBlock succ : lstSuccs) {
@@ -50,7 +37,7 @@ public class DeadCodeHelper {
       }
     }
 
-    HashSet<BasicBlock> setAllBlocks = new HashSet<BasicBlock>(graph.getBlocks());
+    HashSet<BasicBlock> setAllBlocks = new HashSet<>(graph.getBlocks());
     setAllBlocks.removeAll(setStacked);
 
     for (BasicBlock block : setAllBlocks) {
@@ -94,7 +81,7 @@ public class DeadCodeHelper {
         }
       }
 
-      HashSet<BasicBlock> setExits = new HashSet<BasicBlock>(graph.getLast().getPreds());
+      HashSet<BasicBlock> setExits = new HashSet<>(graph.getLast().getPreds());
 
       if (block.getPredExceptions().isEmpty() &&
           (!setExits.contains(block) || block.getPreds().size() == 1)) {
@@ -109,15 +96,15 @@ public class DeadCodeHelper {
           }
         }
 
-        HashSet<BasicBlock> setPreds = new HashSet<BasicBlock>(block.getPreds());
-        HashSet<BasicBlock> setSuccs = new HashSet<BasicBlock>(block.getSuccs());
+        HashSet<BasicBlock> setPreds = new HashSet<>(block.getPreds());
+        HashSet<BasicBlock> setSuccs = new HashSet<>(block.getSuccs());
 
         // collect common exception ranges of predecessors and successors
         HashSet<BasicBlock> setCommonExceptionHandlers = null;
         for (int i = 0; i < 2; ++i) {
           for (BasicBlock pred : i == 0 ? setPreds : setSuccs) {
             if (setCommonExceptionHandlers == null) {
-              setCommonExceptionHandlers = new HashSet<BasicBlock>(pred.getSuccExceptions());
+              setCommonExceptionHandlers = new HashSet<>(pred.getSuccExceptions());
             }
             else {
               setCommonExceptionHandlers.retainAll(pred.getSuccExceptions());
@@ -159,7 +146,7 @@ public class DeadCodeHelper {
           BasicBlock pred = block.getPreds().get(0);
           pred.removeSuccessor(block);
 
-          List<BasicBlock> lstSuccs = new ArrayList<BasicBlock>(block.getSuccs());
+          List<BasicBlock> lstSuccs = new ArrayList<>(block.getSuccs());
           for (BasicBlock succ : lstSuccs) {
             block.removeSuccessor(succ);
             pred.addSuccessor(succ);
@@ -205,13 +192,13 @@ public class DeadCodeHelper {
 
   public static boolean isDominator(ControlFlowGraph graph, BasicBlock block, BasicBlock dom) {
 
-    HashSet<BasicBlock> marked = new HashSet<BasicBlock>();
+    HashSet<BasicBlock> marked = new HashSet<>();
 
     if (block == dom) {
       return true;
     }
 
-    LinkedList<BasicBlock> lstNodes = new LinkedList<BasicBlock>();
+    LinkedList<BasicBlock> lstNodes = new LinkedList<>();
     lstNodes.add(block);
 
     while (!lstNodes.isEmpty()) {
@@ -230,14 +217,14 @@ public class DeadCodeHelper {
 
       for (int i = 0; i < node.getPreds().size(); i++) {
         BasicBlock pred = node.getPreds().get(i);
-        if (!marked.contains(pred) && pred != dom) {
+        if (pred != dom && !marked.contains(pred)) {
           lstNodes.add(pred);
         }
       }
 
       for (int i = 0; i < node.getPredExceptions().size(); i++) {
         BasicBlock pred = node.getPredExceptions().get(i);
-        if (!marked.contains(pred) && pred != dom) {
+        if (pred != dom && !marked.contains(pred)) {
           lstNodes.add(pred);
         }
       }
@@ -262,12 +249,158 @@ public class DeadCodeHelper {
   public static void connectDummyExitBlock(ControlFlowGraph graph) {
 
     BasicBlock exit = graph.getLast();
-    for (BasicBlock block : new HashSet<BasicBlock>(exit.getPreds())) {
+    for (BasicBlock block : new HashSet<>(exit.getPreds())) {
       exit.removePredecessor(block);
       block.addSuccessor(exit);
     }
   }
 
+  public static void extendSynchronizedRangeToMonitorexit(ControlFlowGraph graph) {
+
+    while(true) {
+
+      boolean range_extended = false;
+
+      for (ExceptionRangeCFG range : graph.getExceptions()) {
+
+        Set<BasicBlock> setPreds = new HashSet<>();
+        for (BasicBlock block : range.getProtectedRange()) {
+          setPreds.addAll(block.getPreds());
+        }
+        setPreds.removeAll(range.getProtectedRange());
+
+        if(setPreds.size() != 1) {
+          continue; // multiple predecessors, obfuscated range
+        }
+
+        BasicBlock predBlock = setPreds.iterator().next();
+        InstructionSequence predSeq = predBlock.getSeq();
+        if(predSeq.isEmpty() || predSeq.getLastInstr().opcode != CodeConstants.opc_monitorenter) {
+          continue; // not a synchronized range
+        }
+
+        boolean monitorexit_in_range = false;
+        Set<BasicBlock> setProtectedBlocks = new HashSet<>();
+        setProtectedBlocks.addAll(range.getProtectedRange());
+        setProtectedBlocks.add(range.getHandler());
+
+        for (BasicBlock block : setProtectedBlocks) {
+          InstructionSequence blockSeq = block.getSeq();
+          for (int i = 0; i < blockSeq.length(); i++) {
+            if (blockSeq.getInstr(i).opcode == CodeConstants.opc_monitorexit) {
+              monitorexit_in_range = true;
+              break;
+            }
+          }
+          if(monitorexit_in_range) {
+            break;
+          }
+        }
+
+        if(monitorexit_in_range) {
+          continue; // protected range already contains monitorexit
+        }
+
+        Set<BasicBlock> setSuccs = new HashSet<>();
+        for (BasicBlock block : range.getProtectedRange()) {
+          setSuccs.addAll(block.getSuccs());
+        }
+        setSuccs.removeAll(range.getProtectedRange());
+
+        if(setSuccs.size() != 1) {
+          continue; // non-unique successor
+        }
+
+        BasicBlock succBlock = setSuccs.iterator().next();
+        InstructionSequence succSeq = succBlock.getSeq();
+
+        int succ_monitorexit_index = -1;
+        for (int i = 0; i < succSeq.length(); i++) {
+          if (succSeq.getInstr(i).opcode == CodeConstants.opc_monitorexit) {
+            succ_monitorexit_index = i;
+            break;
+          }
+        }
+
+        if(succ_monitorexit_index < 0) {
+          continue; // monitorexit not found in the single successor block
+        }
+
+        BasicBlock handlerBlock = range.getHandler();
+        if(handlerBlock.getSuccs().size() != 1) {
+          continue; // non-unique handler successor
+        }
+        BasicBlock succHandler = handlerBlock.getSuccs().get(0);
+        InstructionSequence succHandlerSeq = succHandler.getSeq();
+        if(succHandlerSeq.isEmpty() || succHandlerSeq.getLastInstr().opcode != CodeConstants.opc_athrow) {
+          continue; // not a standard synchronized range
+        }
+
+        int handler_monitorexit_index = -1;
+        for (int i = 0; i < succHandlerSeq.length(); i++) {
+          if (succHandlerSeq.getInstr(i).opcode == CodeConstants.opc_monitorexit) {
+            handler_monitorexit_index = i;
+            break;
+          }
+        }
+
+        if(handler_monitorexit_index < 0) {
+          continue; // monitorexit not found in the handler successor block
+        }
+
+        // checks successful, prerequisites satisfied, now extend the range
+        if(succ_monitorexit_index < succSeq.length() - 1) { // split block
+
+          SimpleInstructionSequence seq = new SimpleInstructionSequence();
+          for(int counter = 0; counter < succ_monitorexit_index; counter++) {
+            seq.addInstruction(succSeq.getInstr(0), -1);
+            succSeq.removeInstruction(0);
+          }
+
+          // build a separate block
+          BasicBlock newblock = new BasicBlock(++graph.last_id);
+          newblock.setSeq(seq);
+
+          // insert new block
+          for (BasicBlock block : succBlock.getPreds()) {
+            block.replaceSuccessor(succBlock, newblock);
+          }
+
+          newblock.addSuccessor(succBlock);
+          graph.getBlocks().addWithKey(newblock, newblock.id);
+
+          succBlock = newblock;
+        }
+
+        // copy exception edges and extend protected ranges (successor block)
+        BasicBlock rangeExitBlock = succBlock.getPreds().get(0);
+        for (int j = 0; j < rangeExitBlock.getSuccExceptions().size(); j++) {
+          BasicBlock hd = rangeExitBlock.getSuccExceptions().get(j);
+          succBlock.addSuccessorException(hd);
+
+          ExceptionRangeCFG rng = graph.getExceptionRange(hd, rangeExitBlock);
+          rng.getProtectedRange().add(succBlock);
+        }
+
+        // copy instructions (handler successor block)
+        InstructionSequence handlerSeq = handlerBlock.getSeq();
+        for(int counter = 0; counter < handler_monitorexit_index; counter++) {
+          handlerSeq.addInstruction(succHandlerSeq.getInstr(0), -1);
+          succHandlerSeq.removeInstruction(0);
+        }
+
+        range_extended = true;
+        break;
+      }
+
+      if(!range_extended) {
+        break;
+      }
+    }
+
+  }
+
+
   public static void incorporateValueReturns(ControlFlowGraph graph) {
 
     for (BasicBlock block : graph.getBlocks()) {
@@ -311,8 +444,8 @@ public class DeadCodeHelper {
 
           if (!block.getPreds().isEmpty()) {
 
-            HashSet<BasicBlock> setPredHandlersUnion = new HashSet<BasicBlock>();
-            HashSet<BasicBlock> setPredHandlersIntersection = new HashSet<BasicBlock>();
+            HashSet<BasicBlock> setPredHandlersUnion = new HashSet<>();
+            HashSet<BasicBlock> setPredHandlersIntersection = new HashSet<>();
 
             boolean firstpred = true;
             for (BasicBlock pred : block.getPreds()) {
@@ -339,7 +472,7 @@ public class DeadCodeHelper {
             }
 
             // remove redundant ranges
-            HashSet<BasicBlock> setRangesToBeRemoved = new HashSet<BasicBlock>(block.getSuccExceptions());
+            HashSet<BasicBlock> setRangesToBeRemoved = new HashSet<>(block.getSuccExceptions());
             setRangesToBeRemoved.removeAll(setPredHandlersUnion);
 
             for (BasicBlock handler : setRangesToBeRemoved) {
@@ -369,7 +502,7 @@ public class DeadCodeHelper {
               }
 
               // remove superfluous ranges from successors
-              for (BasicBlock succ : new HashSet<BasicBlock>(block.getSuccExceptions())) {
+              for (BasicBlock succ : new HashSet<>(block.getSuccExceptions())) {
                 if (!bpred.getSuccExceptions().contains(succ)) {
                   ExceptionRangeCFG range = graph.getExceptionRange(succ, block);
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java
new file mode 100644
index 0000000..6e1155d
--- /dev/null
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ClasspathHelper.java
@@ -0,0 +1,72 @@
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.java.decompiler.modules.decompiler;
+
+import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
+import org.jetbrains.java.decompiler.struct.gen.VarType;
+
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ClasspathHelper {
+
+  private static final Map<String, Method> METHOD_CACHE = Collections.synchronizedMap(new HashMap<>());
+
+  public static Method findMethod(String classname, String methodName, MethodDescriptor descriptor) {
+    String targetClass = classname.replace('/', '.');
+    String methodSignature = buildMethodSignature(targetClass + '.' + methodName, descriptor);
+
+    Method method;
+    if (METHOD_CACHE.containsKey(methodSignature)) {
+      method = METHOD_CACHE.get(methodSignature);
+    }
+    else {
+      method = findMethodOnClasspath(targetClass, methodSignature);
+      METHOD_CACHE.put(methodSignature, method);
+    }
+
+    return method;
+  }
+
+  private static Method findMethodOnClasspath(String targetClass, String methodSignature) {
+    try {
+      // use bootstrap classloader to only provide access to JRE classes
+      Class cls = new ClassLoader(null) {}.loadClass(targetClass);
+      for (Method mtd : cls.getMethods()) {
+        // use contains() to ignore access modifiers and thrown exceptions
+        if (mtd.toString().contains(methodSignature)) {
+          return mtd;
+        }
+      }
+    }
+    catch (Exception e) {
+      // ignore
+    }
+    return null;
+  }
+
+  private static String buildMethodSignature(String name, MethodDescriptor md) {
+    StringBuilder sb = new StringBuilder();
+
+    appendType(sb, md.ret);
+    sb.append(' ').append(name).append('(');
+    for (VarType param : md.params) {
+      appendType(sb, param);
+      sb.append(',');
+    }
+    if (sb.charAt(sb.length() - 1) == ',') {
+      sb.setLength(sb.length() - 1);
+    }
+    sb.append(')');
+
+    return sb.toString();
+  }
+
+  private static void appendType(StringBuilder sb, VarType type) {
+    sb.append(type.value.replace('/', '.'));
+    for (int i = 0; i < type.arrayDim; i++) {
+      sb.append("[]");
+    }
+  }
+}
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ClearStructHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ClearStructHelper.java
index c6495e6..ede1dda 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ClearStructHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ClearStructHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
@@ -25,7 +11,7 @@ public class ClearStructHelper {
 
   public static void clearStatements(RootStatement root) {
 
-    LinkedList<Statement> stack = new LinkedList<Statement>();
+    LinkedList<Statement> stack = new LinkedList<>();
     stack.add(root);
 
     while (!stack.isEmpty()) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
index 74ef0a2..7d5c207 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
@@ -1,27 +1,17 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
+import org.jetbrains.java.decompiler.struct.consts.PooledConstant;
+import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant;
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 public class ConcatenationHelper {
 
@@ -52,6 +42,12 @@ public class ConcatenationHelper {
           exprTmp = iex.getInstance();
         }
       }
+      else if ("makeConcatWithConstants".equals(iex.getName())) { // java 9 style
+        List<Exprent> parameters = extractParameters(iex.getBootstrapArguments(), iex);
+        if (parameters.size() >= 2) {
+          return createConcatExprent(parameters, expr.bytecode);
+        }
+      }
     }
 
     if (exprTmp == null) {
@@ -60,7 +56,7 @@ public class ConcatenationHelper {
 
 
     // iterate in depth, collecting possible operands
-    List<Exprent> lstOperands = new ArrayList<Exprent>();
+    List<Exprent> lstOperands = new ArrayList<>();
 
     while (true) {
 
@@ -125,20 +121,69 @@ public class ConcatenationHelper {
         lstOperands.set(i, rep);
       }
     }
+    return createConcatExprent(lstOperands, expr.bytecode);
+  }
 
+  private static Exprent createConcatExprent(List<Exprent> lstOperands, Set<Integer> bytecode) {
     // build exprent to return
     Exprent func = lstOperands.get(0);
 
     for (int i = 1; i < lstOperands.size(); i++) {
-      List<Exprent> lstTmp = new ArrayList<Exprent>();
-      lstTmp.add(func);
-      lstTmp.add(lstOperands.get(i));
-      func = new FunctionExprent(FunctionExprent.FUNCTION_STR_CONCAT, lstTmp, expr.bytecode);
+      func = new FunctionExprent(FunctionExprent.FUNCTION_STR_CONCAT, Arrays.asList(func, lstOperands.get(i)), bytecode);
     }
 
     return func;
   }
 
+  // See StringConcatFactory in jdk sources
+  private static final char TAG_ARG = '\u0001';
+  private static final char TAG_CONST = '\u0002';
+
+  private static List<Exprent> extractParameters(List<PooledConstant> bootstrapArguments, InvocationExprent expr) {
+    List<Exprent> parameters = expr.getLstParameters();
+    if (bootstrapArguments != null) {
+      PooledConstant constant = bootstrapArguments.get(0);
+      if (constant.type == CodeConstants.CONSTANT_String) {
+        String recipe = ((PrimitiveConstant)constant).getString();
+
+        List<Exprent> res = new ArrayList<>();
+        StringBuilder acc = new StringBuilder();
+        int parameterId = 0;
+        for (int i = 0; i < recipe.length(); i++) {
+          char c = recipe.charAt(i);
+
+          if (c == TAG_CONST || c == TAG_ARG) {
+            // Detected a special tag, flush all accumulated characters
+            // as a constant first:
+            if (acc.length() > 0) {
+              res.add(new ConstExprent(VarType.VARTYPE_STRING, acc.toString(), expr.bytecode));
+              acc.setLength(0);
+            }
+            if (c == TAG_CONST) {
+              // skip for now
+            }
+            if (c == TAG_ARG) {
+              res.add(parameters.get(parameterId++));
+            }
+          }
+          else {
+            // Not a special characters, this is a constant embedded into
+            // the recipe itself.
+            acc.append(c);
+          }
+        }
+
+        // Flush the remaining characters as constant:
+        if (acc.length() > 0) {
+          res.add(new ConstExprent(VarType.VARTYPE_STRING, acc.toString(), expr.bytecode));
+        }
+
+        return res;
+      }
+    }
+    return new ArrayList<>(parameters);
+  }
+
   private static boolean isAppendConcat(InvocationExprent expr, VarType cltype) {
 
     if ("append".equals(expr.getName())) {
@@ -167,13 +212,9 @@ public class ConcatenationHelper {
   }
 
   private static boolean isNewConcat(NewExprent expr, VarType cltype) {
-
     if (expr.getNewType().equals(cltype)) {
       VarType[] params = expr.getConstructor().getDescriptor().params;
-      if (params.length == 0 || (params.length == 1 &&
-                                 params[0].equals(VarType.VARTYPE_STRING))) {
-        return true;
-      }
+      return params.length == 0 || params.length == 1 && params[0].equals(VarType.VARTYPE_STRING);
     }
 
     return false;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
index 9c719db..1549734 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
@@ -1,33 +1,22 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 
 public class DecHelper {
 
-  public static boolean checkStatementExceptions(List<Statement> lst) {
+  public static boolean checkStatementExceptions(List<? extends Statement> lst) {
 
-    Set<Statement> all = new HashSet<Statement>(lst);
+    Set<Statement> all = new HashSet<>(lst);
 
-    Set<Statement> handlers = new HashSet<Statement>();
+    Set<Statement> handlers = new HashSet<>();
     Set<Statement> intersection = null;
 
     for (Statement stat : lst) {
@@ -37,7 +26,7 @@ public class DecHelper {
         intersection = setNew;
       }
       else {
-        HashSet<Statement> interclone = new HashSet<Statement>(intersection);
+        HashSet<Statement> interclone = new HashSet<>(intersection);
         interclone.removeAll(setNew);
 
         intersection.retainAll(setNew);
@@ -66,7 +55,7 @@ public class DecHelper {
     return true;
   }
 
-  public static boolean isChoiceStatement(Statement head, List<Statement> lst) {
+  public static boolean isChoiceStatement(Statement head, List<? super Statement> lst) {
 
     Statement post = null;
 
@@ -159,7 +148,7 @@ public class DecHelper {
             if (head == statd) {
               return false;
             }
-            if (!setDest.contains(statd) && post != statd) {
+            if (post != statd && !setDest.contains(statd)) {
               if (post != null) {
                 return false;
               }
@@ -194,25 +183,17 @@ public class DecHelper {
     return true;
   }
 
-
-  public static HashSet<Statement> getUniquePredExceptions(Statement head) {
-
-    HashSet<Statement> setHandlers = new HashSet<Statement>(head.getNeighbours(StatEdge.TYPE_EXCEPTION, Statement.DIRECTION_FORWARD));
-
-    Iterator<Statement> it = setHandlers.iterator();
-    while (it.hasNext()) {
-      if (it.next().getPredecessorEdges(StatEdge.TYPE_EXCEPTION).size() > 1) {
-        it.remove();
-      }
-    }
+  public static Set<Statement> getUniquePredExceptions(Statement head) {
+    Set<Statement> setHandlers = new HashSet<>(head.getNeighbours(StatEdge.TYPE_EXCEPTION, Statement.DIRECTION_FORWARD));
+    setHandlers.removeIf(statement -> statement.getPredecessorEdges(StatEdge.TYPE_EXCEPTION).size() > 1);
     return setHandlers;
   }
 
-  public static List<Exprent> copyExprentList(List<Exprent> lst) {
-    List<Exprent> ret = new ArrayList<Exprent>();
+  public static List<Exprent> copyExprentList(List<? extends Exprent> lst) {
+    List<Exprent> ret = new ArrayList<>();
     for (Exprent expr : lst) {
       ret.add(expr.copy());
     }
     return ret;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
index c93be38..2c5e3eb 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
@@ -35,7 +21,7 @@ public class DomHelper {
 
   private static RootStatement graphToStatement(ControlFlowGraph graph) {
 
-    VBStyleCollection<Statement, Integer> stats = new VBStyleCollection<Statement, Integer>();
+    VBStyleCollection<Statement, Integer> stats = new VBStyleCollection<>();
     VBStyleCollection<BasicBlock, Integer> blocks = graph.getBlocks();
 
     for (BasicBlock block : blocks) {
@@ -103,14 +89,14 @@ public class DomHelper {
 
   public static VBStyleCollection<List<Integer>, Integer> calcPostDominators(Statement container) {
 
-    HashMap<Statement, FastFixedSet<Statement>> lists = new HashMap<Statement, FastFixedSet<Statement>>();
+    HashMap<Statement, FastFixedSet<Statement>> lists = new HashMap<>();
 
     StrongConnectivityHelper schelper = new StrongConnectivityHelper(container);
     List<List<Statement>> components = schelper.getComponents();
 
     List<Statement> lstStats = container.getPostReversePostOrderList(StrongConnectivityHelper.getExitReps(components));
 
-    FastFixedSetFactory<Statement> factory = new FastFixedSetFactory<Statement>(lstStats);
+    FastFixedSetFactory<Statement> factory = new FastFixedSetFactory<>(lstStats);
 
     FastFixedSet<Statement> setFlagNodes = factory.spawnEmptySet();
     setFlagNodes.setAllElements();
@@ -176,26 +162,22 @@ public class DomHelper {
     }
     while (!setFlagNodes.isEmpty());
 
-    VBStyleCollection<List<Integer>, Integer> ret = new VBStyleCollection<List<Integer>, Integer>();
+    VBStyleCollection<List<Integer>, Integer> ret = new VBStyleCollection<>();
     List<Statement> lstRevPost = container.getReversePostOrderList(); // sort order crucial!
 
-    final HashMap<Integer, Integer> mapSortOrder = new HashMap<Integer, Integer>();
+    final HashMap<Integer, Integer> mapSortOrder = new HashMap<>();
     for (int i = 0; i < lstRevPost.size(); i++) {
       mapSortOrder.put(lstRevPost.get(i).id, i);
     }
 
     for (Statement st : lstStats) {
 
-      List<Integer> lstPosts = new ArrayList<Integer>();
+      List<Integer> lstPosts = new ArrayList<>();
       for (Statement stt : lists.get(st)) {
         lstPosts.add(stt.id);
       }
 
-      Collections.sort(lstPosts, new Comparator<Integer>() {
-        public int compare(Integer o1, Integer o2) {
-          return mapSortOrder.get(o1).compareTo(mapSortOrder.get(o2));
-        }
-      });
+      lstPosts.sort(Comparator.comparing(mapSortOrder::get));
 
       if (lstPosts.size() > 1 && lstPosts.get(0).intValue() == st.id) {
         lstPosts.add(lstPosts.remove(0));
@@ -211,7 +193,7 @@ public class DomHelper {
 
     RootStatement root = graphToStatement(graph);
 
-    if (!processStatement(root, new HashMap<Integer, Set<Integer>>())) {
+    if (!processStatement(root, new HashMap<>())) {
 
       //			try {
       //				DotExporter.toDotFile(root.getFirst().getStats().get(13), new File("c:\\Temp\\stat1.dot"));
@@ -221,7 +203,7 @@ public class DomHelper {
       throw new RuntimeException("parsing failure!");
     }
 
-    LabelHelper.lowContinueLabels(root, new HashSet<StatEdge>());
+    LabelHelper.lowContinueLabels(root, new HashSet<>());
 
     SequenceHelper.condenseSequences(root);
     root.buildMonitorFlags();
@@ -291,7 +273,7 @@ public class DomHelper {
                 SynchronizedStatement sync = new SynchronizedStatement(current, ca.getFirst(), ca.getHandler());
                 sync.setAllParent();
 
-                for (StatEdge edge : new HashSet<StatEdge>(ca.getLabelEdges())) {
+                for (StatEdge edge : new HashSet<>(ca.getLabelEdges())) {
                   sync.addLabeledEdge(edge);
                 }
 
@@ -361,7 +343,7 @@ public class DomHelper {
           //						DotExporter.toDotFile(general, new File("c:\\Temp\\stat1.dot"));
           //					} catch(Exception ex) {ex.printStackTrace();}
 
-          mapExtPost = new HashMap<Integer, Set<Integer>>();
+          mapExtPost = new HashMap<>();
           mapRefreshed = true;
         }
 
@@ -382,7 +364,7 @@ public class DomHelper {
             Statement stat = findGeneralStatement(general, forceall, mapExtPost);
 
             if (stat != null) {
-              boolean complete = processStatement(stat, general.getFirst() == stat ? mapExtPost : new HashMap<Integer, Set<Integer>>());
+              boolean complete = processStatement(stat, general.getFirst() == stat ? mapExtPost : new HashMap<>());
 
               if (complete) {
                 // replace general purpose statement with simple one
@@ -392,7 +374,7 @@ public class DomHelper {
                 return false;
               }
 
-              mapExtPost = new HashMap<Integer, Set<Integer>>();
+              mapExtPost = new HashMap<>();
               mapRefreshed = true;
               reducibility = 0;
             }
@@ -413,7 +395,7 @@ public class DomHelper {
         break;
       }
       else {
-        mapExtPost = new HashMap<Integer, Set<Integer>>();
+        mapExtPost = new HashMap<>();
       }
     }
 
@@ -431,13 +413,13 @@ public class DomHelper {
     }
 
     if (forceall) {
-      vbPost = new VBStyleCollection<List<Integer>, Integer>();
+      vbPost = new VBStyleCollection<>();
       List<Statement> lstAll = stat.getPostReversePostOrderList();
 
       for (Statement st : lstAll) {
         Set<Integer> set = mapExtPost.get(st.id);
         if (set != null) {
-          vbPost.addWithKey(new ArrayList<Integer>(set), st.id); // FIXME: sort order!!
+          vbPost.addWithKey(new ArrayList<>(set), st.id); // FIXME: sort order!!
         }
       }
 
@@ -447,7 +429,7 @@ public class DomHelper {
         for (Integer id : setFirst) {
           List<Integer> lst = vbPost.getWithKey(id);
           if (lst == null) {
-            vbPost.addWithKey(lst = new ArrayList<Integer>(), id);
+            vbPost.addWithKey(lst = new ArrayList<>(), id);
           }
           lst.add(id);
         }
@@ -471,14 +453,12 @@ public class DomHelper {
 
       Set<Integer> setExtPosts = mapExtPost.get(headid);
 
-      for (int i = 0; i < posts.size(); i++) {
-
-        Integer postid = posts.get(i);
-        if (!postid.equals(headid) && !setExtPosts.contains(postid)) {
+      for (Integer postId : posts) {
+        if (!postId.equals(headid) && !setExtPosts.contains(postId)) {
           continue;
         }
 
-        Statement post = stats.getWithKey(postid);
+        Statement post = stats.getWithKey(postId);
 
         if (post == null) { // possible in case of an inherited postdominance set
           continue;
@@ -486,11 +466,11 @@ public class DomHelper {
 
         boolean same = (post == head);
 
-        HashSet<Statement> setNodes = new HashSet<Statement>();
-        HashSet<Statement> setPreds = new HashSet<Statement>();
+        HashSet<Statement> setNodes = new HashSet<>();
+        HashSet<Statement> setPreds = new HashSet<>();
 
         // collect statement nodes
-        HashSet<Statement> setHandlers = new HashSet<Statement>();
+        HashSet<Statement> setHandlers = new HashSet<>();
         setHandlers.add(head);
         while (true) {
 
@@ -508,7 +488,7 @@ public class DomHelper {
             }
 
             if (addhd) {
-              LinkedList<Statement> lstStack = new LinkedList<Statement>();
+              LinkedList<Statement> lstStack = new LinkedList<>();
               lstStack.add(handler);
 
               while (!lstStack.isEmpty()) {
@@ -557,14 +537,14 @@ public class DomHelper {
 
         // build statement and return
         if (excok) {
-          Statement res = null;
+          Statement res;
 
           setPreds.removeAll(setNodes);
           if (setPreds.size() == 0) {
             if ((setNodes.size() > 1 ||
                  head.getNeighbours(StatEdge.TYPE_REGULAR, Statement.DIRECTION_BACKWARD).contains(head))
                 && setNodes.size() < stats.size()) {
-              if (checkSynchronizedCompleteness(head, setNodes)) {
+              if (checkSynchronizedCompleteness(setNodes)) {
                 res = new GeneralStatement(head, setNodes, same ? null : post);
                 stat.collapseNodesToStatement(res);
 
@@ -579,8 +559,7 @@ public class DomHelper {
     return null;
   }
 
-  private static boolean checkSynchronizedCompleteness(Statement head, HashSet<Statement> setNodes) {
-
+  private static boolean checkSynchronizedCompleteness(Set<Statement> setNodes) {
     // check exit nodes
     for (Statement stat : setNodes) {
       if (stat.isMonitorEnter()) {
@@ -622,26 +601,21 @@ public class DomHelper {
 
           // update the postdominator map
           if (!mapExtPost.isEmpty()) {
-            HashSet<Integer> setOldNodes = new HashSet<Integer>();
+            HashSet<Integer> setOldNodes = new HashSet<>();
             for (Statement old : result.getStats()) {
               setOldNodes.add(old.id);
             }
 
             Integer newid = result.id;
 
-            for (Integer key : new ArrayList<Integer>(mapExtPost.keySet())) {
+            for (Integer key : new ArrayList<>(mapExtPost.keySet())) {
               Set<Integer> set = mapExtPost.get(key);
 
               int oldsize = set.size();
               set.removeAll(setOldNodes);
 
               if (setOldNodes.contains(key)) {
-                Set<Integer> setNew = mapExtPost.get(newid);
-                if (setNew == null) {
-                  mapExtPost.put(newid, setNew = new HashSet<Integer>());
-                }
-                setNew.addAll(set);
-
+                mapExtPost.computeIfAbsent(newid, k -> new HashSet<>()).addAll(set);
                 mapExtPost.remove(key);
               }
               else {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
deleted file mode 100644
index 16f7da0..0000000
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.modules.decompiler;
-
-import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
-import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-
-public class EliminateLoopsHelper {
-
-
-  //	public static boolean eliminateLoops(Statement root) {
-  //
-  //		boolean ret = eliminateLoopsRec(root);
-  //
-  //		if(ret) {
-  //			SequenceHelper.condenseSequences(root);
-  //
-  //			HashSet<Integer> setReorderedIfs = new HashSet<Integer>();
-  //
-  //			SimplifyExprentsHelper sehelper = new SimplifyExprentsHelper(false);
-  //			while(sehelper.simplifyStackVarsStatement(root, setReorderedIfs, null)) {
-  //				SequenceHelper.condenseSequences(root);
-  //			}
-  //		}
-  //
-  //		return ret;
-  //	}
-
-  private static boolean eliminateLoopsRec(Statement stat) {
-
-    for (Statement st : stat.getStats()) {
-      if (eliminateLoopsRec(st)) {
-        return true;
-      }
-    }
-
-    if (stat.type == Statement.TYPE_DO && isLoopRedundant((DoStatement)stat)) {
-      return true;
-    }
-
-    return false;
-  }
-
-  private static boolean isLoopRedundant(DoStatement loop) {
-
-    if (loop.getLooptype() != DoStatement.LOOP_DO) {
-      return false;
-    }
-
-    // get parent loop if exists
-    Statement parentloop = loop.getParent();
-    while (parentloop != null && parentloop.type != Statement.TYPE_DO) {
-      parentloop = parentloop.getParent();
-    }
-
-    if (parentloop == null || parentloop.getBasichead() != loop.getBasichead()) {
-      return false;
-    }
-
-    // collect relevant break edges
-    List<StatEdge> lstBreakEdges = new ArrayList<StatEdge>();
-    for (StatEdge edge : loop.getLabelEdges()) {
-      if (edge.getType() == StatEdge.TYPE_BREAK) { // all break edges are explicit because of LOOP_DO type
-        lstBreakEdges.add(edge);
-      }
-    }
-
-
-    Statement loopcontent = loop.getFirst();
-
-    boolean firstok = loopcontent.getAllSuccessorEdges().isEmpty();
-    if (!firstok) {
-      StatEdge edge = loopcontent.getAllSuccessorEdges().get(0);
-      firstok = (edge.closure == loop && edge.getType() == StatEdge.TYPE_BREAK);
-      if (firstok) {
-        lstBreakEdges.remove(edge);
-      }
-    }
-
-
-    if (!lstBreakEdges.isEmpty()) {
-      if (firstok) {
-
-        HashMap<Integer, Boolean> statLabeled = new HashMap<Integer, Boolean>();
-        List<Statement> lstEdgeClosures = new ArrayList<Statement>();
-
-        for (StatEdge edge : lstBreakEdges) {
-          Statement minclosure = LowBreakHelper.getMinClosure(loopcontent, edge.getSource());
-          lstEdgeClosures.add(minclosure);
-        }
-
-        int precount = loop.isLabeled() ? 1 : 0;
-        for (Statement st : lstEdgeClosures) {
-          if (!statLabeled.containsKey(st.id)) {
-            boolean btemp = st.isLabeled();
-            precount += btemp ? 1 : 0;
-            statLabeled.put(st.id, btemp);
-          }
-        }
-
-        for (int i = 0; i < lstBreakEdges.size(); i++) {
-          Statement st = lstEdgeClosures.get(i);
-          statLabeled.put(st.id, LowBreakHelper.isBreakEdgeLabeled(lstBreakEdges.get(i).getSource(), st) | statLabeled.get(st.id));
-        }
-
-        for (int i = 0; i < lstBreakEdges.size(); i++) {
-          lstEdgeClosures.set(i, getMaxBreakLift(lstEdgeClosures.get(i), lstBreakEdges.get(i), statLabeled, loop));
-        }
-
-        statLabeled.clear();
-        for (Statement st : lstEdgeClosures) {
-          statLabeled.put(st.id, st.isLabeled());
-        }
-
-        for (int i = 0; i < lstBreakEdges.size(); i++) {
-          Statement st = lstEdgeClosures.get(i);
-          statLabeled.put(st.id, LowBreakHelper.isBreakEdgeLabeled(lstBreakEdges.get(i).getSource(), st) | statLabeled.get(st.id));
-        }
-
-        int postcount = 0;
-        for (Boolean val : statLabeled.values()) {
-          postcount += val ? 1 : 0;
-        }
-
-        if (precount <= postcount) {
-          return false;
-        }
-        else {
-          for (int i = 0; i < lstBreakEdges.size(); i++) {
-            lstEdgeClosures.get(i).addLabeledEdge(lstBreakEdges.get(i));
-          }
-        }
-      }
-      else {
-        return false;
-      }
-    }
-
-    eliminateLoop(loop, parentloop);
-
-    return true;
-  }
-
-  private static Statement getMaxBreakLift(Statement stat, StatEdge edge, HashMap<Integer, Boolean> statLabeled, Statement max) {
-
-    Statement closure = stat;
-    Statement newclosure = stat;
-
-    while ((newclosure = getNextBreakLift(newclosure, edge, statLabeled, max)) != null) {
-      closure = newclosure;
-    }
-
-    return closure;
-  }
-
-  private static Statement getNextBreakLift(Statement stat, StatEdge edge, HashMap<Integer, Boolean> statLabeled, Statement max) {
-
-    Statement closure = stat.getParent();
-
-    while (closure != null && closure != max && !closure.containsStatementStrict(edge.getDestination())) {
-
-      boolean edge_labeled = LowBreakHelper.isBreakEdgeLabeled(edge.getSource(), closure);
-      boolean stat_labeled = statLabeled.containsKey(closure.id) ? statLabeled.get(closure.id) : closure.isLabeled();
-
-      if (stat_labeled || !edge_labeled) {
-        return closure;
-      }
-
-      closure = closure.getParent();
-    }
-
-    return null;
-  }
-
-  private static void eliminateLoop(Statement loop, Statement parentloop) {
-
-    // move continue edges to the parent loop
-    List<StatEdge> lst = new ArrayList<StatEdge>(loop.getLabelEdges());
-    for (StatEdge edge : lst) {
-      loop.removePredecessor(edge);
-      edge.getSource().changeEdgeNode(Statement.DIRECTION_FORWARD, edge, parentloop);
-      parentloop.addPredecessor(edge);
-
-      parentloop.addLabeledEdge(edge);
-    }
-
-    // remove the last break edge, if exists
-    Statement loopcontent = loop.getFirst();
-    if (!loopcontent.getAllSuccessorEdges().isEmpty()) {
-      loopcontent.removeSuccessor(loopcontent.getAllSuccessorEdges().get(0));
-    }
-
-    // replace loop with its content
-    loop.getParent().replaceStatement(loop, loopcontent);
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
index d467cdc..3b9847f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
@@ -21,7 +7,6 @@ import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.ExitExprent;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.*;
-import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,32 +14,23 @@ import java.util.List;
 import java.util.Set;
 
 public class ExitHelper {
-
-
   public static boolean condenseExits(RootStatement root) {
-
     int changed = integrateExits(root);
 
     if (changed > 0) {
-
       cleanUpUnreachableBlocks(root);
-
       SequenceHelper.condenseSequences(root);
     }
 
     return (changed > 0);
   }
 
-
   private static void cleanUpUnreachableBlocks(Statement stat) {
-
     boolean found;
     do {
-
       found = false;
 
       for (int i = 0; i < stat.getStats().size(); i++) {
-
         Statement st = stat.getStats().get(i);
 
         cleanUpUnreachableBlocks(st);
@@ -71,7 +47,7 @@ public class ExitHelper {
               set.remove(secondlast);
 
               if (set.isEmpty()) {
-                last.setExprents(new ArrayList<Exprent>());
+                last.setExprents(new ArrayList<>());
                 found = true;
                 break;
               }
@@ -83,16 +59,12 @@ public class ExitHelper {
     while (found);
   }
 
-
   private static int integrateExits(Statement stat) {
-
     int ret = 0;
-    Statement dest = null;
+    Statement dest;
 
     if (stat.getExprents() == null) {
-
       while (true) {
-
         int changed = 0;
 
         for (Statement st : stat.getStats()) {
@@ -108,33 +80,31 @@ public class ExitHelper {
         }
       }
 
+      if (stat.type == Statement.TYPE_IF) {
+        IfStatement ifst = (IfStatement)stat;
+        if (ifst.getIfstat() == null) {
+          StatEdge ifedge = ifst.getIfEdge();
+          dest = isExitEdge(ifedge);
+          if (dest != null) {
+            BasicBlockStatement bstat = new BasicBlockStatement(new BasicBlock(
+              DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.STATEMENT_COUNTER)));
+            bstat.setExprents(DecHelper.copyExprentList(dest.getExprents()));
 
-      switch (stat.type) {
-        case Statement.TYPE_IF:
-          IfStatement ifst = (IfStatement)stat;
-          if (ifst.getIfstat() == null) {
-            StatEdge ifedge = ifst.getIfEdge();
-            dest = isExitEdge(ifedge);
-            if (dest != null) {
-              BasicBlockStatement bstat = new BasicBlockStatement(new BasicBlock(
-                DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.STATEMENT_COUNTER)));
-              bstat.setExprents(DecHelper.copyExprentList(dest.getExprents()));
+            ifst.getFirst().removeSuccessor(ifedge);
+            StatEdge newedge = new StatEdge(StatEdge.TYPE_REGULAR, ifst.getFirst(), bstat);
+            ifst.getFirst().addSuccessor(newedge);
+            ifst.setIfEdge(newedge);
+            ifst.setIfstat(bstat);
+            ifst.getStats().addWithKey(bstat, bstat.id);
+            bstat.setParent(ifst);
 
-              ifst.getFirst().removeSuccessor(ifedge);
-              StatEdge newedge = new StatEdge(StatEdge.TYPE_REGULAR, ifst.getFirst(), bstat);
-              ifst.getFirst().addSuccessor(newedge);
-              ifst.setIfEdge(newedge);
-              ifst.setIfstat(bstat);
-              ifst.getStats().addWithKey(bstat, bstat.id);
-              bstat.setParent(ifst);
-
-              StatEdge oldexitedge = dest.getAllSuccessorEdges().get(0);
-              StatEdge newexitedge = new StatEdge(StatEdge.TYPE_BREAK, bstat, oldexitedge.getDestination());
-              bstat.addSuccessor(newexitedge);
-              oldexitedge.closure.addLabeledEdge(newexitedge);
-              ret = 1;
-            }
+            StatEdge oldexitedge = dest.getAllSuccessorEdges().get(0);
+            StatEdge newexitedge = new StatEdge(StatEdge.TYPE_BREAK, bstat, oldexitedge.getDestination());
+            bstat.addSuccessor(newexitedge);
+            oldexitedge.closure.addLabeledEdge(newexitedge);
+            ret = 1;
           }
+        }
       }
     }
 
@@ -168,15 +138,12 @@ public class ExitHelper {
           // LabelHelper.lowContinueLabels(block, new HashSet<StatEdge>());
           // do it by hand
           for (StatEdge prededge : block.getPredecessorEdges(StatEdge.TYPE_CONTINUE)) {
-
             block.removePredecessor(prededge);
             prededge.getSource().changeEdgeNode(Statement.DIRECTION_FORWARD, prededge, stat);
             stat.addPredecessor(prededge);
-
             stat.addLabeledEdge(prededge);
           }
 
-
           stat.addSuccessor(new StatEdge(StatEdge.TYPE_REGULAR, stat, bstat));
 
           for (StatEdge edge : dest.getAllPredecessorEdges()) {
@@ -202,11 +169,9 @@ public class ExitHelper {
   }
 
   private static Statement isExitEdge(StatEdge edge) {
-
     Statement dest = edge.getDestination();
 
-    if (edge.getType() == StatEdge.TYPE_BREAK && dest.type == Statement.TYPE_BASICBLOCK
-        && edge.explicit && (edge.labeled || isOnlyEdge(edge))) {
+    if (edge.getType() == StatEdge.TYPE_BREAK && dest.type == Statement.TYPE_BASICBLOCK && edge.explicit && (edge.labeled || isOnlyEdge(edge))) {
       List<Exprent> data = dest.getExprents();
 
       if (data != null && data.size() == 1) {
@@ -220,7 +185,6 @@ public class ExitHelper {
   }
 
   private static boolean isOnlyEdge(StatEdge edge) {
-
     Statement stat = edge.getDestination();
 
     for (StatEdge ed : stat.getAllPredecessorEdges()) {
@@ -243,10 +207,7 @@ public class ExitHelper {
     return true;
   }
 
-  public static boolean removeRedundantReturns(RootStatement root) {
-
-    boolean res = false;
-
+  public static void removeRedundantReturns(RootStatement root) {
     DummyExitStatement dummyExit = root.getDummyExit();
 
     for (StatEdge edge : dummyExit.getAllPredecessorEdges()) {
@@ -261,88 +222,10 @@ public class ExitHelper {
               // remove redundant return
               dummyExit.addBytecodeOffsets(ex.bytecode);
               lstExpr.remove(lstExpr.size() - 1);
-              res = true;
             }
           }
         }
       }
     }
-
-    return res;
   }
-
-  public static boolean handleReturnFromInitializer(RootStatement root) {
-
-    boolean res = false;
-
-    Statement exit = root.getDummyExit();
-    Statement top = root.getFirst();
-    Statement newret = null;
-
-    boolean sharedcreated = false;
-
-    for (StatEdge edge : exit.getAllPredecessorEdges()) {
-      if (edge.explicit) {
-
-        if (!sharedcreated) {
-          newret = addSharedInitializerReturn(root);
-          sharedcreated = true;
-        }
-
-        Statement source = edge.getSource();
-        List<Exprent> lstExpr = source.getExprents();
-        if (lstExpr != null && !lstExpr.isEmpty()) {
-          Exprent expr = lstExpr.get(lstExpr.size() - 1);
-          if (expr.type == Exprent.EXPRENT_EXIT) {
-            ExitExprent ex = (ExitExprent)expr;
-            if (ex.getExitType() == ExitExprent.EXIT_RETURN && ex.getValue() == null) {
-              lstExpr.remove(lstExpr.size() - 1);
-
-              source.removeSuccessor(edge);
-              source.addSuccessor(new StatEdge(StatEdge.TYPE_BREAK, source, newret, top));
-
-              res = true;
-            }
-          }
-        }
-      }
-    }
-
-    return res;
-  }
-
-  private static Statement addSharedInitializerReturn(RootStatement root) {
-
-    Statement exit = root.getDummyExit();
-    Statement top = root.getFirst();
-
-    // build a new statement with the single instruction 'return'
-    BasicBlockStatement bstat = new BasicBlockStatement(new BasicBlock(
-      DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.STATEMENT_COUNTER)));
-
-    ExitExprent retexpr = new ExitExprent(ExitExprent.EXIT_RETURN, null,
-                                          ((MethodDescriptor)DecompilerContext
-                                            .getProperty(DecompilerContext.CURRENT_METHOD_DESCRIPTOR)).ret, null);
-    // a changeable list needed
-    bstat.setExprents(new ArrayList<Exprent>(Arrays.asList(new Exprent[]{retexpr})));
-
-    // build sequence to replace the former top statement
-    SequenceStatement seq = new SequenceStatement(Arrays.asList(top, bstat));
-    top.setParent(seq);
-    bstat.setParent(seq);
-    seq.setParent(root);
-
-    root.getStats().removeWithKey(top.id);
-    root.getStats().addWithKeyAndIndex(0, seq, seq.id);
-    root.setFirst(seq);
-
-    for (StatEdge succedge : top.getAllSuccessorEdges()) {
-      top.removeSuccessor(succedge);
-    }
-
-    top.addSuccessor(new StatEdge(StatEdge.TYPE_REGULAR, top, bstat));
-    bstat.addSuccessor(new StatEdge(StatEdge.TYPE_BREAK, bstat, exit, seq));
-
-    return bstat;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
index 9b48600..966cd44 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -20,7 +6,7 @@ import org.jetbrains.java.decompiler.code.Instruction;
 import org.jetbrains.java.decompiler.code.InstructionSequence;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
 import org.jetbrains.java.decompiler.modules.decompiler.sforms.DirectGraph;
@@ -38,149 +24,115 @@ import org.jetbrains.java.decompiler.struct.consts.PooledConstant;
 import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant;
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
+import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.*;
 
 public class ExprProcessor implements CodeConstants {
-
   public static final String UNDEFINED_TYPE_STRING = "<undefinedtype>";
   public static final String UNKNOWN_TYPE_STRING = "<unknown>";
   public static final String NULL_TYPE_STRING = "<null>";
 
-  private static final HashMap<Integer, Integer> mapConsts = new HashMap<Integer, Integer>();
-
+  private static final Map<Integer, Integer> mapConsts = new HashMap<>();
   static {
-
-    // mapConsts.put(new Integer(opc_i2l), new
-    // Integer(FunctionExprent.FUNCTION_I2L));
-    // mapConsts.put(new Integer(opc_i2f), new
-    // Integer(FunctionExprent.FUNCTION_I2F));
-    // mapConsts.put(new Integer(opc_i2d), new
-    // Integer(FunctionExprent.FUNCTION_I2D));
-    // mapConsts.put(new Integer(opc_l2i), new
-    // Integer(FunctionExprent.FUNCTION_L2I));
-    // mapConsts.put(new Integer(opc_l2f), new
-    // Integer(FunctionExprent.FUNCTION_L2F));
-    // mapConsts.put(new Integer(opc_l2d), new
-    // Integer(FunctionExprent.FUNCTION_L2D));
-    // mapConsts.put(new Integer(opc_f2i), new
-    // Integer(FunctionExprent.FUNCTION_F2I));
-    // mapConsts.put(new Integer(opc_f2l), new
-    // Integer(FunctionExprent.FUNCTION_F2L));
-    // mapConsts.put(new Integer(opc_f2d), new
-    // Integer(FunctionExprent.FUNCTION_F2D));
-    // mapConsts.put(new Integer(opc_d2i), new
-    // Integer(FunctionExprent.FUNCTION_D2I));
-    // mapConsts.put(new Integer(opc_d2l), new
-    // Integer(FunctionExprent.FUNCTION_D2L));
-    // mapConsts.put(new Integer(opc_d2f), new
-    // Integer(FunctionExprent.FUNCTION_D2F));
-    // mapConsts.put(new Integer(opc_i2b), new
-    // Integer(FunctionExprent.FUNCTION_I2B));
-    // mapConsts.put(new Integer(opc_i2c), new
-    // Integer(FunctionExprent.FUNCTION_I2C));
-    // mapConsts.put(new Integer(opc_i2s), new
-    // Integer(FunctionExprent.FUNCTION_I2S));
-
-    mapConsts.put(new Integer(opc_arraylength), new Integer(FunctionExprent.FUNCTION_ARRAY_LENGTH));
-    mapConsts.put(new Integer(opc_checkcast), new Integer(FunctionExprent.FUNCTION_CAST));
-    mapConsts.put(new Integer(opc_instanceof), new Integer(FunctionExprent.FUNCTION_INSTANCEOF));
+    mapConsts.put(opc_arraylength, FunctionExprent.FUNCTION_ARRAY_LENGTH);
+    mapConsts.put(opc_checkcast, FunctionExprent.FUNCTION_CAST);
+    mapConsts.put(opc_instanceof, FunctionExprent.FUNCTION_INSTANCEOF);
   }
 
-  private static final VarType[] consts =
-    new VarType[]{VarType.VARTYPE_INT, VarType.VARTYPE_FLOAT, VarType.VARTYPE_LONG, VarType.VARTYPE_DOUBLE, VarType.VARTYPE_CLASS,
-      VarType.VARTYPE_STRING};
+  private static final VarType[] consts = {
+    VarType.VARTYPE_INT, VarType.VARTYPE_FLOAT, VarType.VARTYPE_LONG, VarType.VARTYPE_DOUBLE, VarType.VARTYPE_CLASS, VarType.VARTYPE_STRING
+  };
 
-  private static final VarType[] vartypes =
-    new VarType[]{VarType.VARTYPE_INT, VarType.VARTYPE_LONG, VarType.VARTYPE_FLOAT, VarType.VARTYPE_DOUBLE, VarType.VARTYPE_OBJECT};
+  private static final VarType[] varTypes = {
+    VarType.VARTYPE_INT, VarType.VARTYPE_LONG, VarType.VARTYPE_FLOAT, VarType.VARTYPE_DOUBLE, VarType.VARTYPE_OBJECT
+  };
 
-  private static final VarType[] arrtypes =
-    new VarType[]{VarType.VARTYPE_INT, VarType.VARTYPE_LONG, VarType.VARTYPE_FLOAT, VarType.VARTYPE_DOUBLE, VarType.VARTYPE_OBJECT,
-      VarType.VARTYPE_BOOLEAN, VarType.VARTYPE_CHAR, VarType.VARTYPE_SHORT};
+  private static final VarType[] arrTypes = {
+    VarType.VARTYPE_INT, VarType.VARTYPE_LONG, VarType.VARTYPE_FLOAT, VarType.VARTYPE_DOUBLE, VarType.VARTYPE_OBJECT,
+    VarType.VARTYPE_BOOLEAN, VarType.VARTYPE_CHAR, VarType.VARTYPE_SHORT
+  };
 
-  private static final int[] func1 =
-    new int[]{FunctionExprent.FUNCTION_ADD, FunctionExprent.FUNCTION_SUB, FunctionExprent.FUNCTION_MUL, FunctionExprent.FUNCTION_DIV,
-      FunctionExprent.FUNCTION_REM};
+  private static final int[] func1 = {
+    FunctionExprent.FUNCTION_ADD, FunctionExprent.FUNCTION_SUB, FunctionExprent.FUNCTION_MUL, FunctionExprent.FUNCTION_DIV,
+    FunctionExprent.FUNCTION_REM
+  };
+  private static final int[] func2 = {
+    FunctionExprent.FUNCTION_SHL, FunctionExprent.FUNCTION_SHR, FunctionExprent.FUNCTION_USHR, FunctionExprent.FUNCTION_AND,
+    FunctionExprent.FUNCTION_OR, FunctionExprent.FUNCTION_XOR
+  };
+  private static final int[] func3 = {
+    FunctionExprent.FUNCTION_I2L, FunctionExprent.FUNCTION_I2F, FunctionExprent.FUNCTION_I2D, FunctionExprent.FUNCTION_L2I,
+    FunctionExprent.FUNCTION_L2F, FunctionExprent.FUNCTION_L2D, FunctionExprent.FUNCTION_F2I, FunctionExprent.FUNCTION_F2L,
+    FunctionExprent.FUNCTION_F2D, FunctionExprent.FUNCTION_D2I, FunctionExprent.FUNCTION_D2L, FunctionExprent.FUNCTION_D2F,
+    FunctionExprent.FUNCTION_I2B, FunctionExprent.FUNCTION_I2C, FunctionExprent.FUNCTION_I2S
+  };
+  private static final int[] func4 = {
+    FunctionExprent.FUNCTION_LCMP, FunctionExprent.FUNCTION_FCMPL, FunctionExprent.FUNCTION_FCMPG, FunctionExprent.FUNCTION_DCMPL,
+    FunctionExprent.FUNCTION_DCMPG
+  };
+  private static final int[] func5 = {
+    IfExprent.IF_EQ, IfExprent.IF_NE, IfExprent.IF_LT, IfExprent.IF_GE, IfExprent.IF_GT, IfExprent.IF_LE
+  };
+  private static final int[] func6 = {
+    IfExprent.IF_ICMPEQ, IfExprent.IF_ICMPNE, IfExprent.IF_ICMPLT, IfExprent.IF_ICMPGE, IfExprent.IF_ICMPGT, IfExprent.IF_ICMPLE,
+    IfExprent.IF_ACMPEQ, IfExprent.IF_ACMPNE
+  };
+  private static final int[] func7 = {IfExprent.IF_NULL, IfExprent.IF_NONNULL};
+  private static final int[] func8 = {MonitorExprent.MONITOR_ENTER, MonitorExprent.MONITOR_EXIT};
 
-  private static final int[] func2 =
-    new int[]{FunctionExprent.FUNCTION_SHL, FunctionExprent.FUNCTION_SHR, FunctionExprent.FUNCTION_USHR, FunctionExprent.FUNCTION_AND,
-      FunctionExprent.FUNCTION_OR, FunctionExprent.FUNCTION_XOR};
+  private static final int[] arrTypeIds = {
+    CodeConstants.TYPE_BOOLEAN, CodeConstants.TYPE_CHAR, CodeConstants.TYPE_FLOAT, CodeConstants.TYPE_DOUBLE,
+    CodeConstants.TYPE_BYTE, CodeConstants.TYPE_SHORT, CodeConstants.TYPE_INT, CodeConstants.TYPE_LONG
+  };
 
-  private static final int[] func3 =
-    new int[]{FunctionExprent.FUNCTION_I2L, FunctionExprent.FUNCTION_I2F, FunctionExprent.FUNCTION_I2D, FunctionExprent.FUNCTION_L2I,
-      FunctionExprent.FUNCTION_L2F, FunctionExprent.FUNCTION_L2D, FunctionExprent.FUNCTION_F2I, FunctionExprent.FUNCTION_F2L,
-      FunctionExprent.FUNCTION_F2D,
-      FunctionExprent.FUNCTION_D2I, FunctionExprent.FUNCTION_D2L, FunctionExprent.FUNCTION_D2F, FunctionExprent.FUNCTION_I2B,
-      FunctionExprent.FUNCTION_I2C,
-      FunctionExprent.FUNCTION_I2S};
+  private static final int[] negIfs = {
+    IfExprent.IF_NE, IfExprent.IF_EQ, IfExprent.IF_GE, IfExprent.IF_LT, IfExprent.IF_LE, IfExprent.IF_GT, IfExprent.IF_NONNULL,
+    IfExprent.IF_NULL, IfExprent.IF_ICMPNE, IfExprent.IF_ICMPEQ, IfExprent.IF_ICMPGE, IfExprent.IF_ICMPLT, IfExprent.IF_ICMPLE,
+    IfExprent.IF_ICMPGT, IfExprent.IF_ACMPNE, IfExprent.IF_ACMPEQ
+  };
 
-  private static final int[] func4 =
-    new int[]{FunctionExprent.FUNCTION_LCMP, FunctionExprent.FUNCTION_FCMPL, FunctionExprent.FUNCTION_FCMPG, FunctionExprent.FUNCTION_DCMPL,
-      FunctionExprent.FUNCTION_DCMPG};
+  private static final String[] typeNames = {"byte", "char", "double", "float", "int", "long", "short", "boolean"};
 
-  private static final int[] func5 =
-    new int[]{IfExprent.IF_EQ, IfExprent.IF_NE, IfExprent.IF_LT, IfExprent.IF_GE, IfExprent.IF_GT, IfExprent.IF_LE};
+  private final MethodDescriptor methodDescriptor;
+  private final VarProcessor varProcessor;
 
-  private static final int[] func6 =
-    new int[]{IfExprent.IF_ICMPEQ, IfExprent.IF_ICMPNE, IfExprent.IF_ICMPLT, IfExprent.IF_ICMPGE, IfExprent.IF_ICMPGT, IfExprent.IF_ICMPLE,
-      IfExprent.IF_ACMPEQ, IfExprent.IF_ACMPNE};
-
-  private static final int[] func7 = new int[]{IfExprent.IF_NULL, IfExprent.IF_NONNULL};
-
-  private static final int[] func8 = new int[]{MonitorExprent.MONITOR_ENTER, MonitorExprent.MONITOR_EXIT};
-
-  private static final int[] arr_type =
-    new int[]{CodeConstants.TYPE_BOOLEAN, CodeConstants.TYPE_CHAR, CodeConstants.TYPE_FLOAT, CodeConstants.TYPE_DOUBLE,
-      CodeConstants.TYPE_BYTE, CodeConstants.TYPE_SHORT, CodeConstants.TYPE_INT, CodeConstants.TYPE_LONG};
-
-  private static final int[] negifs =
-    new int[]{IfExprent.IF_NE, IfExprent.IF_EQ, IfExprent.IF_GE, IfExprent.IF_LT, IfExprent.IF_LE, IfExprent.IF_GT, IfExprent.IF_NONNULL,
-      IfExprent.IF_NULL, IfExprent.IF_ICMPNE, IfExprent.IF_ICMPEQ, IfExprent.IF_ICMPGE, IfExprent.IF_ICMPLT, IfExprent.IF_ICMPLE,
-      IfExprent.IF_ICMPGT, IfExprent.IF_ACMPNE,
-      IfExprent.IF_ACMPEQ};
-
-  private static final String[] typeNames = new String[]{"byte", "char", "double", "float", "int", "long", "short", "boolean",};
-
-  private final VarProcessor varProcessor = (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR);
+  public ExprProcessor(MethodDescriptor md, VarProcessor varProc) {
+    methodDescriptor = md;
+    varProcessor = varProc;
+  }
 
   public void processStatement(RootStatement root, StructClass cl) {
-
     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
     DirectGraph dgraph = flatthelper.buildDirectGraph(root);
 
-    //		try {
-    //			DotExporter.toDotFile(dgraph, new File("c:\\Temp\\gr12_my.dot"));
-    //		} catch (Exception ex) {
-    //			ex.printStackTrace();
-    //		}
-
     // collect finally entry points
-    Set<String> setFinallyShortRangeEntryPoints = new HashSet<String>();
+    Set<String> setFinallyShortRangeEntryPoints = new HashSet<>();
     for (List<FinallyPathWrapper> lst : dgraph.mapShortRangeFinallyPaths.values()) {
       for (FinallyPathWrapper finwrap : lst) {
         setFinallyShortRangeEntryPoints.add(finwrap.entry);
       }
     }
 
-    Set<String> setFinallyLongRangeEntryPaths = new HashSet<String>();
+    Set<String> setFinallyLongRangeEntryPaths = new HashSet<>();
     for (List<FinallyPathWrapper> lst : dgraph.mapLongRangeFinallyPaths.values()) {
       for (FinallyPathWrapper finwrap : lst) {
         setFinallyLongRangeEntryPaths.add(finwrap.source + "##" + finwrap.entry);
       }
     }
 
-    Map<String, VarExprent> mapCatch = new HashMap<String, VarExprent>();
+    Map<String, VarExprent> mapCatch = new HashMap<>();
     collectCatchVars(root, flatthelper, mapCatch);
 
-    Map<DirectNode, Map<String, PrimitiveExprsList>> mapData = new HashMap<DirectNode, Map<String, PrimitiveExprsList>>();
+    Map<DirectNode, Map<String, PrimitiveExprsList>> mapData = new HashMap<>();
 
-    LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
-    LinkedList<LinkedList<String>> stackEntryPoint = new LinkedList<LinkedList<String>>();
+    LinkedList<DirectNode> stack = new LinkedList<>();
+    LinkedList<LinkedList<String>> stackEntryPoint = new LinkedList<>();
 
     stack.add(dgraph.first);
-    stackEntryPoint.add(new LinkedList<String>());
+    stackEntryPoint.add(new LinkedList<>());
 
-    Map<String, PrimitiveExprsList> map = new HashMap<String, PrimitiveExprsList>();
+    Map<String, PrimitiveExprsList> map = new HashMap<>();
     map.put(null, new PrimitiveExprsList());
     mapData.put(dgraph.first, map);
 
@@ -219,13 +171,8 @@ public class ExprProcessor implements CodeConstants {
         }
 
         if (isSuccessor) {
-
-          Map<String, PrimitiveExprsList> mapSucc = mapData.get(nd);
-          if (mapSucc == null) {
-            mapData.put(nd, mapSucc = new HashMap<String, PrimitiveExprsList>());
-          }
-
-          LinkedList<String> ndentrypoints = new LinkedList<String>(entrypoints);
+          Map<String, PrimitiveExprsList> mapSucc = mapData.computeIfAbsent(nd, k -> new HashMap<>());
+          LinkedList<String> ndentrypoints = new LinkedList<>(entrypoints);
 
           if (setFinallyLongRangeEntryPaths.contains(node.id + "##" + nd.id)) {
             ndentrypoints.addLast(node.id);
@@ -322,8 +269,7 @@ public class ExprProcessor implements CodeConstants {
   public void processBlock(BasicBlockStatement stat, PrimitiveExprsList data, StructClass cl) {
 
     ConstantPool pool = cl.getPool();
-    StructBootstrapMethodsAttribute bootstrap =
-      (StructBootstrapMethodsAttribute)cl.getAttributes().getWithKey(StructGeneralAttribute.ATTRIBUTE_BOOTSTRAP_METHODS);
+    StructBootstrapMethodsAttribute bootstrap = cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_BOOTSTRAP_METHODS);
 
     BasicBlock block = stat.getBlock();
 
@@ -344,31 +290,31 @@ public class ExprProcessor implements CodeConstants {
           break;
         case opc_bipush:
         case opc_sipush:
-          pushEx(stack, exprlist, new ConstExprent(instr.getOperand(0), true, bytecode_offsets));
+          pushEx(stack, exprlist, new ConstExprent(instr.operand(0), true, bytecode_offsets));
           break;
         case opc_lconst_0:
         case opc_lconst_1:
-          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_LONG, new Long(instr.opcode - opc_lconst_0), bytecode_offsets));
+          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_LONG, (long)(instr.opcode - opc_lconst_0), bytecode_offsets));
           break;
         case opc_fconst_0:
         case opc_fconst_1:
         case opc_fconst_2:
-          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_FLOAT, new Float(instr.opcode - opc_fconst_0), bytecode_offsets));
+          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_FLOAT, (float)(instr.opcode - opc_fconst_0), bytecode_offsets));
           break;
         case opc_dconst_0:
         case opc_dconst_1:
-          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_DOUBLE, new Double(instr.opcode - opc_dconst_0), bytecode_offsets));
+          pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_DOUBLE, (double)(instr.opcode - opc_dconst_0), bytecode_offsets));
           break;
         case opc_ldc:
         case opc_ldc_w:
         case opc_ldc2_w:
-          PooledConstant cn = pool.getConstant(instr.getOperand(0));
+          PooledConstant cn = pool.getConstant(instr.operand(0));
           if (cn instanceof PrimitiveConstant) {
             pushEx(stack, exprlist, new ConstExprent(consts[cn.type - CONSTANT_Integer], ((PrimitiveConstant)cn).value, bytecode_offsets));
           }
           else if (cn instanceof LinkConstant) {
             //TODO: for now treat Links as Strings
-            pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_STRING, ((LinkConstant)cn).elementname , bytecode_offsets));
+            pushEx(stack, exprlist, new ConstExprent(VarType.VARTYPE_STRING, ((LinkConstant)cn).elementname, bytecode_offsets));
           }
           break;
         case opc_iload:
@@ -376,7 +322,7 @@ public class ExprProcessor implements CodeConstants {
         case opc_fload:
         case opc_dload:
         case opc_aload:
-          pushEx(stack, exprlist, new VarExprent(instr.getOperand(0), vartypes[instr.opcode - opc_iload], varProcessor));
+          pushEx(stack, exprlist, new VarExprent(instr.operand(0), varTypes[instr.opcode - opc_iload], varProcessor, bytecode_offset));
           break;
         case opc_iaload:
         case opc_laload:
@@ -397,17 +343,17 @@ public class ExprProcessor implements CodeConstants {
             case opc_daload:
               vartype = VarType.VARTYPE_DOUBLE;
           }
-          pushEx(stack, exprlist, new ArrayExprent(arr, index, arrtypes[instr.opcode - opc_iaload], bytecode_offsets), vartype);
+          pushEx(stack, exprlist, new ArrayExprent(arr, index, arrTypes[instr.opcode - opc_iaload], bytecode_offsets), vartype);
           break;
         case opc_istore:
         case opc_lstore:
         case opc_fstore:
         case opc_dstore:
         case opc_astore:
-          Exprent top = stack.pop();
-          int varindex = instr.getOperand(0);
-          AssignmentExprent assign =
-            new AssignmentExprent(new VarExprent(varindex, vartypes[instr.opcode - opc_istore], varProcessor), top, bytecode_offsets);
+          Exprent expr = stack.pop();
+          int varindex = instr.operand(0);
+          AssignmentExprent assign = new AssignmentExprent(
+            new VarExprent(varindex, varTypes[instr.opcode - opc_istore], varProcessor, nextMeaningfulOffset(block, i)), expr, bytecode_offsets);
           exprlist.add(assign);
           break;
         case opc_iastore:
@@ -422,7 +368,8 @@ public class ExprProcessor implements CodeConstants {
           Exprent index_store = stack.pop();
           Exprent arr_store = stack.pop();
           AssignmentExprent arrassign =
-            new AssignmentExprent(new ArrayExprent(arr_store, index_store, arrtypes[instr.opcode - opc_iastore], bytecode_offsets), value, bytecode_offsets);
+            new AssignmentExprent(new ArrayExprent(arr_store, index_store, arrTypes[instr.opcode - opc_iastore], bytecode_offsets), value,
+                                  bytecode_offsets);
           exprlist.add(arrassign);
           break;
         case opc_iadd:
@@ -468,10 +415,10 @@ public class ExprProcessor implements CodeConstants {
           pushEx(stack, exprlist, new FunctionExprent(FunctionExprent.FUNCTION_NEG, stack, bytecode_offsets));
           break;
         case opc_iinc:
-          VarExprent vevar = new VarExprent(instr.getOperand(0), VarType.VARTYPE_INT, varProcessor);
+          VarExprent vevar = new VarExprent(instr.operand(0), VarType.VARTYPE_INT, varProcessor);
           exprlist.add(new AssignmentExprent(vevar, new FunctionExprent(
-            instr.getOperand(1) < 0 ? FunctionExprent.FUNCTION_SUB : FunctionExprent.FUNCTION_ADD, Arrays
-            .asList(vevar.copy(), new ConstExprent(VarType.VARTYPE_INT, Math.abs(instr.getOperand(1)), null)),
+            instr.operand(1) < 0 ? FunctionExprent.FUNCTION_SUB : FunctionExprent.FUNCTION_ADD, Arrays
+            .asList(vevar.copy(), new ConstExprent(VarType.VARTYPE_INT, Math.abs(instr.operand(1)), null)),
             bytecode_offsets), bytecode_offsets));
           break;
         case opc_i2l:
@@ -504,7 +451,7 @@ public class ExprProcessor implements CodeConstants {
         case opc_ifge:
         case opc_ifgt:
         case opc_ifle:
-          exprlist.add(new IfExprent(negifs[func5[instr.opcode - opc_ifeq]], stack, bytecode_offsets));
+          exprlist.add(new IfExprent(negIfs[func5[instr.opcode - opc_ifeq]], stack, bytecode_offsets));
           break;
         case opc_if_icmpeq:
         case opc_if_icmpne:
@@ -514,16 +461,16 @@ public class ExprProcessor implements CodeConstants {
         case opc_if_icmple:
         case opc_if_acmpeq:
         case opc_if_acmpne:
-          exprlist.add(new IfExprent(negifs[func6[instr.opcode - opc_if_icmpeq]], stack, bytecode_offsets));
+          exprlist.add(new IfExprent(negIfs[func6[instr.opcode - opc_if_icmpeq]], stack, bytecode_offsets));
           break;
         case opc_ifnull:
         case opc_ifnonnull:
-          exprlist.add(new IfExprent(negifs[func7[instr.opcode - opc_ifnull]], stack, bytecode_offsets));
+          exprlist.add(new IfExprent(negIfs[func7[instr.opcode - opc_ifnull]], stack, bytecode_offsets));
           break;
         case opc_tableswitch:
         case opc_lookupswitch:
           exprlist.add(new SwitchExprent(stack.pop(), bytecode_offsets));
-        break;
+          break;
         case opc_ireturn:
         case opc_lreturn:
         case opc_freturn:
@@ -533,32 +480,31 @@ public class ExprProcessor implements CodeConstants {
         case opc_athrow:
           exprlist.add(new ExitExprent(instr.opcode == opc_athrow ? ExitExprent.EXIT_THROW : ExitExprent.EXIT_RETURN,
                                        instr.opcode == opc_return ? null : stack.pop(),
-                                       instr.opcode == opc_athrow
-                                       ? null
-                                       : ((MethodDescriptor)DecompilerContext
-                                         .getProperty(DecompilerContext.CURRENT_METHOD_DESCRIPTOR)).ret,
+                                       instr.opcode == opc_athrow ? null : methodDescriptor.ret,
                                        bytecode_offsets));
-        break;
+          break;
         case opc_monitorenter:
         case opc_monitorexit:
           exprlist.add(new MonitorExprent(func8[instr.opcode - opc_monitorenter], stack.pop(), bytecode_offsets));
           break;
         case opc_checkcast:
         case opc_instanceof:
-          stack.push(new ConstExprent(new VarType(pool.getPrimitiveConstant(instr.getOperand(0)).getString(), true), null, null));
+          stack.push(new ConstExprent(new VarType(pool.getPrimitiveConstant(instr.operand(0)).getString(), true), null, null));
         case opc_arraylength:
-          pushEx(stack, exprlist, new FunctionExprent(mapConsts.get(instr.opcode).intValue(), stack, bytecode_offsets));
+          pushEx(stack, exprlist, new FunctionExprent(mapConsts.get(instr.opcode), stack, bytecode_offsets));
           break;
         case opc_getstatic:
         case opc_getfield:
           pushEx(stack, exprlist,
-                 new FieldExprent(pool.getLinkConstant(instr.getOperand(0)), instr.opcode == opc_getstatic ? null : stack.pop(), bytecode_offsets));
+                 new FieldExprent(pool.getLinkConstant(instr.operand(0)), instr.opcode == opc_getstatic ? null : stack.pop(),
+                                  bytecode_offsets));
           break;
         case opc_putstatic:
         case opc_putfield:
           Exprent valfield = stack.pop();
           Exprent exprfield =
-            new FieldExprent(pool.getLinkConstant(instr.getOperand(0)), instr.opcode == opc_putstatic ? null : stack.pop(), bytecode_offsets);
+            new FieldExprent(pool.getLinkConstant(instr.operand(0)), instr.opcode == opc_putstatic ? null : stack.pop(),
+                             bytecode_offsets);
           exprlist.add(new AssignmentExprent(exprfield, valfield, bytecode_offsets));
           break;
         case opc_invokevirtual:
@@ -566,19 +512,15 @@ public class ExprProcessor implements CodeConstants {
         case opc_invokestatic:
         case opc_invokeinterface:
         case opc_invokedynamic:
-          if (instr.opcode != opc_invokedynamic || instr.bytecode_version >= CodeConstants.BYTECODE_JAVA_7) {
-
-            LinkConstant invoke_constant = pool.getLinkConstant(instr.getOperand(0));
-            int dynamic_invokation_type = -1;
+          if (instr.opcode != opc_invokedynamic || instr.bytecodeVersion >= CodeConstants.BYTECODE_JAVA_7) {
+            LinkConstant invoke_constant = pool.getLinkConstant(instr.operand(0));
 
+            List<PooledConstant> bootstrap_arguments = null;
             if (instr.opcode == opc_invokedynamic && bootstrap != null) {
-              List<PooledConstant> bootstrap_arguments = bootstrap.getMethodArguments(invoke_constant.index1);
-              LinkConstant content_method_handle = (LinkConstant)bootstrap_arguments.get(1);
-
-              dynamic_invokation_type = content_method_handle.index1;
+              bootstrap_arguments = bootstrap.getMethodArguments(invoke_constant.index1);
             }
 
-            InvocationExprent exprinv = new InvocationExprent(instr.opcode, invoke_constant, stack, dynamic_invokation_type, bytecode_offsets);
+            InvocationExprent exprinv = new InvocationExprent(instr.opcode, invoke_constant, bootstrap_arguments, stack, bytecode_offsets);
             if (exprinv.getDescriptor().ret.type == CodeConstants.TYPE_VOID) {
               exprlist.add(exprinv);
             }
@@ -590,15 +532,15 @@ public class ExprProcessor implements CodeConstants {
         case opc_new:
         case opc_anewarray:
         case opc_multianewarray:
-          int dimensions = (instr.opcode == opc_new) ? 0 : (instr.opcode == opc_anewarray) ? 1 : instr.getOperand(1);
-          VarType arrType = new VarType(pool.getPrimitiveConstant(instr.getOperand(0)).getString(), true);
+          int dimensions = (instr.opcode == opc_new) ? 0 : (instr.opcode == opc_anewarray) ? 1 : instr.operand(1);
+          VarType arrType = new VarType(pool.getPrimitiveConstant(instr.operand(0)).getString(), true);
           if (instr.opcode != opc_multianewarray) {
             arrType = arrType.resizeArrayDim(arrType.arrayDim + dimensions);
           }
           pushEx(stack, exprlist, new NewExprent(arrType, stack, dimensions, bytecode_offsets));
           break;
         case opc_newarray:
-          pushEx(stack, exprlist, new NewExprent(new VarType(arr_type[instr.getOperand(0) - 4], 1), stack, 1, bytecode_offsets));
+          pushEx(stack, exprlist, new NewExprent(new VarType(arrTypeIds[instr.operand(0) - 4], 1), stack, 1, bytecode_offsets));
           break;
         case opc_dup:
           pushEx(stack, exprlist, stack.getByOffset(-1).copy());
@@ -657,12 +599,38 @@ public class ExprProcessor implements CodeConstants {
           stack.pop();
           break;
         case opc_pop:
-        case opc_pop2:
           stack.pop();
+          break;
+        case opc_pop2:
+          if (stack.getByOffset(-1).getExprType().stackSize == 1) {
+            // Since value at the top of the stack is a value of category 1 (JVMS9 2.11.1)
+            // we should remove one more item from the stack.
+            // See JVMS9 pop2 chapter.
+            stack.pop();
+          }
+          stack.pop();
+          break;
       }
     }
   }
 
+  private static int nextMeaningfulOffset(BasicBlock block, int index) {
+    InstructionSequence seq = block.getSeq();
+    while (++index < seq.length()) {
+      switch (seq.getInstr(index).opcode) {
+        case opc_nop:
+        case opc_istore:
+        case opc_lstore:
+        case opc_fstore:
+        case opc_dstore:
+        case opc_astore:
+          continue;
+      }
+      return block.getOldOffset(index);
+    }
+    return -1;
+  }
+
   private void pushEx(ExprentStack stack, List<Exprent> exprlist, Exprent exprent) {
     pushEx(stack, exprlist, exprent, null);
   }
@@ -680,7 +648,7 @@ public class ExprProcessor implements CodeConstants {
 
     int base = VarExprent.STACK_BASE + stack.size();
 
-    LinkedList<VarExprent> lst = new LinkedList<VarExprent>();
+    LinkedList<VarExprent> lst = new LinkedList<>();
 
     for (int i = -1; i >= offset; i--) {
       Exprent varex = stack.pop();
@@ -706,7 +674,6 @@ public class ExprProcessor implements CodeConstants {
   }
 
   public static String getTypeName(VarType type, boolean getShort) {
-
     int tp = type.type;
     if (tp <= CodeConstants.TYPE_BOOLEAN) {
       return typeNames[tp];
@@ -741,12 +708,9 @@ public class ExprProcessor implements CodeConstants {
   }
 
   public static String getCastTypeName(VarType type, boolean getShort) {
-    String s = getTypeName(type, getShort);
-    int dim = type.arrayDim;
-    while (dim-- > 0) {
-      s += "[]";
-    }
-    return s;
+    StringBuilder s = new StringBuilder(getTypeName(type, getShort));
+    TextUtil.append(s, "[]", type.arrayDim);
+    return s.toString();
   }
 
   public static PrimitiveExprsList getExpressionData(VarExprent var) {
@@ -759,20 +723,20 @@ public class ExprProcessor implements CodeConstants {
     return prlst;
   }
 
-  public static boolean endsWithSemikolon(Exprent expr) {
+  public static boolean endsWithSemicolon(Exprent expr) {
     int type = expr.type;
     return !(type == Exprent.EXPRENT_SWITCH ||
              type == Exprent.EXPRENT_MONITOR ||
              type == Exprent.EXPRENT_IF ||
-             (type == Exprent.EXPRENT_VAR && ((VarExprent)expr)
-               .isClassDef()));
+             (type == Exprent.EXPRENT_VAR && ((VarExprent)expr).isClassDef()));
   }
 
   private static void addDeletedGotoInstructionMapping(Statement stat, BytecodeMappingTracer tracer) {
     if (stat instanceof BasicBlockStatement) {
       BasicBlock block = ((BasicBlockStatement)stat).getBlock();
       List<Integer> offsets = block.getInstrOldOffsets();
-      if (!offsets.isEmpty() && offsets.size() > block.getSeq().length()) { // some instructions have been deleted, but we still have offsets
+      if (!offsets.isEmpty() &&
+          offsets.size() > block.getSeq().length()) { // some instructions have been deleted, but we still have offsets
         tracer.addMapping(offsets.get(offsets.size() - 1)); // add the last offset
       }
     }
@@ -827,7 +791,7 @@ public class ExprProcessor implements CodeConstants {
     return res;
   }
 
-  public static TextBuffer listToJava(List<Exprent> lst, int indent, BytecodeMappingTracer tracer) {
+  public static TextBuffer listToJava(List<? extends Exprent> lst, int indent, BytecodeMappingTracer tracer) {
     if (lst == null || lst.isEmpty()) {
       return new TextBuffer();
     }
@@ -835,7 +799,14 @@ public class ExprProcessor implements CodeConstants {
     TextBuffer buf = new TextBuffer();
 
     for (Exprent expr : lst) {
+      if (buf.length() > 0 && expr.type == Exprent.EXPRENT_VAR && ((VarExprent)expr).isClassDef()) {
+        // separates local class definition from previous statements
+        buf.appendLineSeparator();
+        tracer.incrementCurrentSourceLine();
+      }
+
       TextBuffer content = expr.toJava(indent, tracer);
+
       if (content.length() > 0) {
         if (expr.type != Exprent.EXPRENT_VAR || !((VarExprent)expr).isClassDef()) {
           buf.appendIndent(indent);
@@ -844,7 +815,7 @@ public class ExprProcessor implements CodeConstants {
         if (expr.type == Exprent.EXPRENT_MONITOR && ((MonitorExprent)expr).getMonType() == MonitorExprent.MONITOR_ENTER) {
           buf.append("{}"); // empty synchronized block
         }
-        if (endsWithSemikolon(expr)) {
+        if (endsWithSemicolon(expr)) {
           buf.append(";");
         }
         buf.appendLineSeparator();
@@ -855,26 +826,24 @@ public class ExprProcessor implements CodeConstants {
     return buf;
   }
 
-  public static ConstExprent getDefaultArrayValue(VarType arrtype) {
-
-    ConstExprent defaultval;
-    if (arrtype.type == CodeConstants.TYPE_OBJECT || arrtype.arrayDim > 0) {
-      defaultval = new ConstExprent(VarType.VARTYPE_NULL, null, null);
+  public static ConstExprent getDefaultArrayValue(VarType arrType) {
+    ConstExprent defaultVal;
+    if (arrType.type == CodeConstants.TYPE_OBJECT || arrType.arrayDim > 0) {
+      defaultVal = new ConstExprent(VarType.VARTYPE_NULL, null, null);
     }
-    else if (arrtype.type == CodeConstants.TYPE_FLOAT) {
-      defaultval = new ConstExprent(VarType.VARTYPE_FLOAT, new Float(0), null);
+    else if (arrType.type == CodeConstants.TYPE_FLOAT) {
+      defaultVal = new ConstExprent(VarType.VARTYPE_FLOAT, 0f, null);
     }
-    else if (arrtype.type == CodeConstants.TYPE_LONG) {
-      defaultval = new ConstExprent(VarType.VARTYPE_LONG, new Long(0), null);
+    else if (arrType.type == CodeConstants.TYPE_LONG) {
+      defaultVal = new ConstExprent(VarType.VARTYPE_LONG, 0L, null);
     }
-    else if (arrtype.type == CodeConstants.TYPE_DOUBLE) {
-      defaultval = new ConstExprent(VarType.VARTYPE_DOUBLE, new Double(0), null);
+    else if (arrType.type == CodeConstants.TYPE_DOUBLE) {
+      defaultVal = new ConstExprent(VarType.VARTYPE_DOUBLE, 0d, null);
     }
     else { // integer types
-      defaultval = new ConstExprent(0, true, null);
+      defaultVal = new ConstExprent(0, true, null);
     }
-
-    return defaultval;
+    return defaultVal;
   }
 
   public static boolean getCastedExprent(Exprent exprent,
@@ -883,7 +852,7 @@ public class ExprProcessor implements CodeConstants {
                                          int indent,
                                          boolean castNull,
                                          BytecodeMappingTracer tracer) {
-    return getCastedExprent(exprent, leftType, buffer, indent, castNull, false, tracer);
+    return getCastedExprent(exprent, leftType, buffer, indent, castNull, false, false, false, tracer);
   }
 
   public static boolean getCastedExprent(Exprent exprent,
@@ -892,18 +861,42 @@ public class ExprProcessor implements CodeConstants {
                                          int indent,
                                          boolean castNull,
                                          boolean castAlways,
+                                         boolean castNarrowing,
+                                         boolean unbox,
                                          BytecodeMappingTracer tracer) {
 
+    if (unbox) {
+      // "unbox" invocation parameters, e.g. 'byteSet.add((byte)123)' or 'new ShortContainer((short)813)'
+      if (exprent.type == Exprent.EXPRENT_INVOCATION && ((InvocationExprent)exprent).isBoxingCall()) {
+        InvocationExprent invocationExprent = (InvocationExprent)exprent;
+        exprent = invocationExprent.getLstParameters().get(0);
+        int paramType = invocationExprent.getDescriptor().params[0].type;
+        if (exprent.type == Exprent.EXPRENT_CONST && ((ConstExprent)exprent).getConstType().type != paramType) {
+          leftType = new VarType(paramType);
+        }
+      }
+    }
+
     VarType rightType = exprent.getExprType();
 
     boolean cast =
       castAlways ||
       (!leftType.isSuperset(rightType) && (rightType.equals(VarType.VARTYPE_OBJECT) || leftType.type != CodeConstants.TYPE_OBJECT)) ||
       (castNull && rightType.type == CodeConstants.TYPE_NULL && !UNDEFINED_TYPE_STRING.equals(getTypeName(leftType))) ||
-      (isIntConstant(exprent) && VarType.VARTYPE_INT.isStrictSuperset(leftType));
-      
+      (castNarrowing && isIntConstant(exprent) && isNarrowedIntType(leftType));
+
     boolean quote = cast && exprent.getPrecedence() >= FunctionExprent.getPrecedence(FunctionExprent.FUNCTION_CAST);
 
+    // cast instead to 'byte' / 'short' when int constant is used as a value for 'Byte' / 'Short'
+    if (castNarrowing && exprent.type == Exprent.EXPRENT_CONST && !((ConstExprent) exprent).isNull()) {
+      if (leftType.equals(VarType.VARTYPE_BYTE_OBJ)) {
+        leftType = VarType.VARTYPE_BYTE;
+      }
+      else if (leftType.equals(VarType.VARTYPE_SHORT_OBJ)) {
+        leftType = VarType.VARTYPE_SHORT;
+      }
+    }
+
     if (cast) buffer.append('(').append(getCastTypeName(leftType)).append(')');
 
     if (quote) buffer.append('(');
@@ -920,10 +913,8 @@ public class ExprProcessor implements CodeConstants {
   }
 
   private static boolean isIntConstant(Exprent exprent) {
-
     if (exprent.type == Exprent.EXPRENT_CONST) {
-      ConstExprent cexpr = (ConstExprent)exprent;
-      switch (cexpr.getConstType().type) {
+      switch (((ConstExprent)exprent).getConstType().type) {
         case CodeConstants.TYPE_BYTE:
         case CodeConstants.TYPE_BYTECHAR:
         case CodeConstants.TYPE_SHORT:
@@ -935,4 +926,9 @@ public class ExprProcessor implements CodeConstants {
 
     return false;
   }
-}
+
+  private static boolean isNarrowedIntType(VarType type) {
+    return VarType.VARTYPE_INT.isStrictSuperset(type) ||
+           type.equals(VarType.VARTYPE_BYTE_OBJ) || type.equals(VarType.VARTYPE_SHORT_OBJ);
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java
index c4cded2..e0bb1b2 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
@@ -28,17 +14,13 @@ public class ExprentStack extends ListStack<Exprent> {
     pointer = list.getPointer();
   }
 
-  public Exprent push(Exprent item) {
-    super.push(item);
-
-    return item;
-  }
-
+  @Override
   public Exprent pop() {
 
     return this.remove(--pointer);
   }
 
+  @Override
   public ExprentStack clone() {
     return new ExprentStack(this);
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
index 9f1c11b..240ee3e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
@@ -1,21 +1,10 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
-import org.jetbrains.java.decompiler.code.*;
+import org.jetbrains.java.decompiler.code.CodeConstants;
+import org.jetbrains.java.decompiler.code.Instruction;
+import org.jetbrains.java.decompiler.code.InstructionSequence;
+import org.jetbrains.java.decompiler.code.SimpleInstructionSequence;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph;
 import org.jetbrains.java.decompiler.code.cfg.ExceptionRangeCFG;
@@ -38,6 +27,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
 import org.jetbrains.java.decompiler.struct.StructMethod;
+import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
@@ -45,30 +35,28 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class FinallyProcessor {
+  private final Map<Integer, Integer> finallyBlockIDs = new HashMap<>();
+  private final Map<Integer, Integer> catchallBlockIDs = new HashMap<>();
 
-  private final Map<Integer, Integer> finallyBlockIDs = new HashMap<Integer, Integer>();
-  private final Map<Integer, Integer> catchallBlockIDs = new HashMap<Integer, Integer>();
+  private final MethodDescriptor methodDescriptor;
+  private final VarProcessor varProcessor;
 
-  private final VarProcessor varprocessor;
-
-  public FinallyProcessor(VarProcessor varprocessor) {
-    this.varprocessor = varprocessor;
+  public FinallyProcessor(MethodDescriptor md, VarProcessor varProc) {
+    methodDescriptor = md;
+    varProcessor = varProc;
   }
 
   public boolean iterateGraph(StructMethod mt, RootStatement root, ControlFlowGraph graph) {
-    //		return processStatement(mt, root, graph, root);
     return processStatementEx(mt, root, graph);
   }
 
   private boolean processStatementEx(StructMethod mt, RootStatement root, ControlFlowGraph graph) {
-
     int bytecode_version = mt.getClassStruct().getBytecodeVersion();
 
-    LinkedList<Statement> stack = new LinkedList<Statement>();
+    LinkedList<Statement> stack = new LinkedList<>();
     stack.add(root);
 
     while (!stack.isEmpty()) {
-
       Statement stat = stack.removeLast();
 
       Statement parent = stat.getParent();
@@ -83,14 +71,12 @@ public class FinallyProcessor {
           // do nothing
         }
         else if (finallyBlockIDs.containsKey(handler.id)) {
-
           fin.setFinally(true);
 
           Integer var = finallyBlockIDs.get(handler.id);
-          fin.setMonitor(var == null ? null : new VarExprent(var.intValue(), VarType.VARTYPE_INT, varprocessor));
+          fin.setMonitor(var == null ? null : new VarExprent(var, VarType.VARTYPE_INT, varProcessor));
         }
         else {
-
           Record inf = getFinallyInformation(mt, root, fin);
 
           if (inf == null) { // inconsistent finally
@@ -124,62 +110,6 @@ public class FinallyProcessor {
     return false;
   }
 
-
-  //	private boolean processStatement(StructMethod mt, RootStatement root, ControlFlowGraph graph, Statement stat) {
-  //
-  //		boolean res = false;
-  //
-  //		for(int i=stat.getStats().size()-1;i>=0;i--) {
-  //			if(processStatement(mt, root, graph, stat.getStats().get(i))) {
-  //				return true;
-  //			}
-  //		}
-  //
-  //
-  //		if(stat.type == Statement.TYPE_CATCHALL && !stat.isCopied()) {
-  //
-  //			CatchAllStatement fin = (CatchAllStatement)stat;
-  //			BasicBlock head = fin.getBasichead().getBlock();
-  //			BasicBlock handler = fin.getHandler().getBasichead().getBlock();
-  //
-  //			if(catchallBlockIDs.containsKey(handler.id)) {
-  //				; // do nothing
-  //			}else if(finallyBlockIDs.containsKey(handler.id)) {
-  //
-  //				fin.setFinally(true);
-  //
-  //				Integer var = finallyBlockIDs.get(handler.id);
-  //				fin.setMonitor(var==null?null:new VarExprent(var.intValue(), VarType.VARTYPE_INT, varprocessor));
-  //
-  //			} else {
-  //
-  //				Object[] inf = getFinallyInformation(mt, root, fin);
-  //
-  //				if(inf == null) { // inconsistent finally
-  //					catchallBlockIDs.put(handler.id, null);
-  //				} else {
-  //
-  //					if(DecompilerContext.getOption(IFernflowerPreferences.FINALLY_DEINLINE) && verifyFinallyEx(graph, fin, inf)) {
-  //						finallyBlockIDs.put(handler.id, null);
-  //					} else {
-  //
-  //						int varindex = DecompilerContext.getCountercontainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER);
-  //						insertSemaphore(graph, getAllBasicBlocks(fin.getFirst()), head, handler, varindex, inf);
-  //
-  //						finallyBlockIDs.put(handler.id, varindex);
-  //					}
-  //
-  //					DeadCodeHelper.removeEmptyBlocks(graph);
-  //					DeadCodeHelper.mergeBasicBlocks(graph);
-  //				}
-  //
-  //				res = true;
-  //			}
-  //		}
-  //
-  //		return res;
-  //	}
-
   private static class Record {
     private final int firstCode;
     private final Map<BasicBlock, Boolean> mapLast;
@@ -190,10 +120,8 @@ public class FinallyProcessor {
     }
   }
 
-
-  private static Record getFinallyInformation(StructMethod mt, RootStatement root, CatchAllStatement fstat) {
-
-    Map<BasicBlock, Boolean> mapLast = new HashMap<BasicBlock, Boolean>();
+  private Record getFinallyInformation(StructMethod mt, RootStatement root, CatchAllStatement fstat) {
+    Map<BasicBlock, Boolean> mapLast = new HashMap<>();
 
     BasicBlockStatement firstBlockStatement = fstat.getHandler().getBasichead();
     BasicBlock firstBasicBlock = firstBlockStatement.getBlock();
@@ -209,7 +137,7 @@ public class FinallyProcessor {
         firstcode = 2;
     }
 
-    ExprProcessor proc = new ExprProcessor();
+    ExprProcessor proc = new ExprProcessor(methodDescriptor, varProcessor);
     proc.processStatement(root, mt.getClassStruct());
 
     SSAConstructorSparseEx ssa = new SSAConstructorSparseEx();
@@ -222,13 +150,12 @@ public class FinallyProcessor {
     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
     DirectGraph dgraph = flatthelper.buildDirectGraph(root);
 
-    LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
+    LinkedList<DirectNode> stack = new LinkedList<>();
     stack.add(dgraph.first);
 
-    Set<DirectNode> setVisited = new HashSet<DirectNode>();
+    Set<DirectNode> setVisited = new HashSet<>();
 
     while (!stack.isEmpty()) {
-
       DirectNode node = stack.removeFirst();
 
       if (setVisited.contains(node)) {
@@ -375,8 +302,7 @@ public class FinallyProcessor {
                                       int var,
                                       Record information,
                                       int bytecode_version) {
-
-    Set<BasicBlock> setCopy = new HashSet<BasicBlock>(setTry);
+    Set<BasicBlock> setCopy = new HashSet<>(setTry);
 
     int finallytype = information.firstCode;
     Map<BasicBlock, Boolean> mapLast = information.mapLast;
@@ -394,21 +320,15 @@ public class FinallyProcessor {
 
     // disable semaphore at statement exit points
     for (BasicBlock block : setTry) {
-
       List<BasicBlock> lstSucc = block.getSuccs();
-      for (BasicBlock dest : lstSucc) {
 
+      for (BasicBlock dest : lstSucc) {
         // break out
-        if (!setCopy.contains(dest) && dest != graph.getLast()) {
+        if (dest != graph.getLast() && !setCopy.contains(dest)) {
           // disable semaphore
           SimpleInstructionSequence seq = new SimpleInstructionSequence();
-
-          seq.addInstruction(ConstantsUtil
-                               .getInstructionInstance(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version,
-                                                       new int[]{0}), -1);
-          seq.addInstruction(ConstantsUtil
-                               .getInstructionInstance(CodeConstants.opc_istore, false, CodeConstants.GROUP_GENERAL, bytecode_version,
-                                                       new int[]{var}), -1);
+          seq.addInstruction(Instruction.create(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{0}), -1);
+          seq.addInstruction(Instruction.create(CodeConstants.opc_istore, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{var}), -1);
 
           // build a separate block
           BasicBlock newblock = new BasicBlock(++graph.last_id);
@@ -435,14 +355,10 @@ public class FinallyProcessor {
       }
     }
 
-    // enable semaphor at the statement entrance
+    // enable semaphore at the statement entrance
     SimpleInstructionSequence seq = new SimpleInstructionSequence();
-    seq.addInstruction(
-      ConstantsUtil.getInstructionInstance(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{1}),
-      -1);
-    seq.addInstruction(
-      ConstantsUtil.getInstructionInstance(CodeConstants.opc_istore, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{var}),
-      -1);
+    seq.addInstruction(Instruction.create(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{1}), -1);
+    seq.addInstruction(Instruction.create(CodeConstants.opc_istore, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{var}), -1);
 
     BasicBlock newhead = new BasicBlock(++graph.last_id);
     newhead.setSeq(seq);
@@ -451,12 +367,8 @@ public class FinallyProcessor {
 
     // initialize semaphor with false
     seq = new SimpleInstructionSequence();
-    seq.addInstruction(
-      ConstantsUtil.getInstructionInstance(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{0}),
-      -1);
-    seq.addInstruction(
-      ConstantsUtil.getInstructionInstance(CodeConstants.opc_istore, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{var}),
-      -1);
+    seq.addInstruction(Instruction.create(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{0}), -1);
+    seq.addInstruction(Instruction.create(CodeConstants.opc_istore, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{var}), -1);
 
     BasicBlock newheadinit = new BasicBlock(++graph.last_id);
     newheadinit.setSeq(seq);
@@ -466,7 +378,7 @@ public class FinallyProcessor {
     setCopy.add(newhead);
     setCopy.add(newheadinit);
 
-    for (BasicBlock hd : new HashSet<BasicBlock>(newheadinit.getSuccExceptions())) {
+    for (BasicBlock hd : new HashSet<>(newheadinit.getSuccExceptions())) {
       ExceptionRangeCFG range = graph.getExceptionRange(hd, newheadinit);
 
       if (setCopy.containsAll(range.getProtectedRange())) {
@@ -476,10 +388,8 @@ public class FinallyProcessor {
     }
   }
 
-
   private static void insertBlockBefore(ControlFlowGraph graph, BasicBlock oldblock, BasicBlock newblock) {
-
-    List<BasicBlock> lstTemp = new ArrayList<BasicBlock>();
+    List<BasicBlock> lstTemp = new ArrayList<>();
     lstTemp.addAll(oldblock.getPreds());
     lstTemp.addAll(oldblock.getPredExceptions());
 
@@ -510,9 +420,8 @@ public class FinallyProcessor {
     }
   }
 
-  private static HashSet<BasicBlock> getAllBasicBlocks(Statement stat) {
-
-    List<Statement> lst = new LinkedList<Statement>();
+  private static Set<BasicBlock> getAllBasicBlocks(Statement stat) {
+    List<Statement> lst = new LinkedList<>();
     lst.add(stat);
 
     int index = 0;
@@ -529,7 +438,7 @@ public class FinallyProcessor {
     }
     while (index < lst.size());
 
-    HashSet<BasicBlock> res = new HashSet<BasicBlock>();
+    Set<BasicBlock> res = new HashSet<>();
 
     for (Statement st : lst) {
       res.add(((BasicBlockStatement)st).getBlock());
@@ -538,11 +447,9 @@ public class FinallyProcessor {
     return res;
   }
 
-
   private boolean verifyFinallyEx(ControlFlowGraph graph, CatchAllStatement fstat, Record information) {
-
-    HashSet<BasicBlock> tryBlocks = getAllBasicBlocks(fstat.getFirst());
-    HashSet<BasicBlock> catchBlocks = getAllBasicBlocks(fstat.getHandler());
+    Set<BasicBlock> tryBlocks = getAllBasicBlocks(fstat.getFirst());
+    Set<BasicBlock> catchBlocks = getAllBasicBlocks(fstat.getHandler());
 
     int finallytype = information.firstCode;
     Map<BasicBlock, Boolean> mapLast = information.mapLast;
@@ -571,7 +478,7 @@ public class FinallyProcessor {
     }
 
     // identify start blocks
-    HashSet<BasicBlock> startBlocks = new HashSet<BasicBlock>();
+    Set<BasicBlock> startBlocks = new HashSet<>();
     for (BasicBlock block : tryBlocks) {
       startBlocks.addAll(block.getSuccs());
     }
@@ -580,7 +487,7 @@ public class FinallyProcessor {
     startBlocks.remove(graph.getLast());
     startBlocks.removeAll(tryBlocks);
 
-    List<Area> lstAreas = new ArrayList<Area>();
+    List<Area> lstAreas = new ArrayList<>();
 
     for (BasicBlock start : startBlocks) {
 
@@ -634,33 +541,32 @@ public class FinallyProcessor {
 
   private Area compareSubgraphsEx(ControlFlowGraph graph,
                                   BasicBlock startSample,
-                                  HashSet<BasicBlock> catchBlocks,
+                                  Set<BasicBlock> catchBlocks,
                                   BasicBlock startCatch,
                                   int finallytype,
                                   Map<BasicBlock, Boolean> mapLast,
                                   boolean skippedFirst) {
-
     class BlockStackEntry {
-      public BasicBlock blockCatch;
-      public BasicBlock blockSample;
+      public final BasicBlock blockCatch;
+      public final BasicBlock blockSample;
 
       // TODO: correct handling (merging) of multiple paths
-      public List<int[]> lstStoreVars;
+      public final List<int[]> lstStoreVars;
 
-      public BlockStackEntry(BasicBlock blockCatch, BasicBlock blockSample, List<int[]> lstStoreVars) {
+      BlockStackEntry(BasicBlock blockCatch, BasicBlock blockSample, List<int[]> lstStoreVars) {
         this.blockCatch = blockCatch;
         this.blockSample = blockSample;
-        this.lstStoreVars = new ArrayList<int[]>(lstStoreVars);
+        this.lstStoreVars = new ArrayList<>(lstStoreVars);
       }
     }
 
-    List<BlockStackEntry> stack = new LinkedList<BlockStackEntry>();
+    List<BlockStackEntry> stack = new LinkedList<>();
 
-    Set<BasicBlock> setSample = new HashSet<BasicBlock>();
+    Set<BasicBlock> setSample = new HashSet<>();
 
-    Map<String, BasicBlock[]> mapNext = new HashMap<String, BasicBlock[]>();
+    Map<String, BasicBlock[]> mapNext = new HashMap<>();
 
-    stack.add(new BlockStackEntry(startCatch, startSample, new ArrayList<int[]>()));
+    stack.add(new BlockStackEntry(startCatch, startSample, new ArrayList<>()));
 
     while (!stack.isEmpty()) {
 
@@ -693,7 +599,6 @@ public class FinallyProcessor {
         }
       }
 
-
       // exception successors
       if (isLastBlock && blockSample.getSeq().isEmpty()) {
         // do nothing, blockSample will be removed anyway
@@ -721,8 +626,8 @@ public class FinallyProcessor {
 
                   if (instrCatch.opcode == CodeConstants.opc_astore &&
                       instrSample.opcode == CodeConstants.opc_astore) {
-                    lst = new ArrayList<int[]>(lst);
-                    lst.add(new int[]{instrCatch.getOperand(0), instrSample.getOperand(0)});
+                    lst = new ArrayList<>(lst);
+                    lst.add(new int[]{instrCatch.operand(0), instrSample.operand(0)});
                   }
                 }
 
@@ -740,7 +645,7 @@ public class FinallyProcessor {
       }
 
       if (isLastBlock) {
-        Set<BasicBlock> setSuccs = new HashSet<BasicBlock>(blockSample.getSuccs());
+        Set<BasicBlock> setSuccs = new HashSet<>(blockSample.getSuccs());
         setSuccs.removeAll(setSample);
 
         for (BlockStackEntry stackent : stack) {
@@ -755,11 +660,10 @@ public class FinallyProcessor {
       }
     }
 
-    return new Area(startSample, setSample, getUniqueNext(graph, new HashSet<BasicBlock[]>(mapNext.values())));
+    return new Area(startSample, setSample, getUniqueNext(graph, new HashSet<>(mapNext.values())));
   }
 
   private static BasicBlock getUniqueNext(ControlFlowGraph graph, Set<BasicBlock[]> setNext) {
-
     // precondition: there is at most one true exit path in a finally statement
 
     BasicBlock next = null;
@@ -800,13 +704,11 @@ public class FinallyProcessor {
                 Instruction instrNext = seqNext.getInstr(i);
                 Instruction instrBlock = seqBlock.getInstr(i);
 
-                if (instrNext.opcode != instrBlock.opcode || instrNext.wide != instrBlock.wide
-                    || instrNext.operandsCount() != instrBlock.operandsCount()) {
+                if (!Instruction.equals(instrNext, instrBlock)) {
                   return null;
                 }
-
-                for (int j = 0; j < instrNext.getOperands().length; j++) {
-                  if (instrNext.getOperand(j) != instrBlock.getOperand(j)) {
+                for (int j = 0; j < instrNext.operandsCount(); j++) {
+                  if (instrNext.operand(j) != instrBlock.operand(j)) {
                     return null;
                   }
                 }
@@ -848,7 +750,6 @@ public class FinallyProcessor {
                                        int type,
                                        int finallytype,
                                        List<int[]> lstStoreVars) {
-
     InstructionSequence seqPattern = pattern.getSeq();
     InstructionSequence seqSample = sample.getSeq();
 
@@ -887,9 +788,8 @@ public class FinallyProcessor {
     }
 
     if (seqPattern.length() < seqSample.length()) { // split in two blocks
-
       SimpleInstructionSequence seq = new SimpleInstructionSequence();
-      LinkedList<Integer> oldOffsets = new LinkedList<Integer>();
+      LinkedList<Integer> oldOffsets = new LinkedList<>();
       for (int i = seqSample.length() - 1; i >= seqPattern.length(); i--) {
         seq.addInstruction(0, seqSample.getInstr(i), -1);
         oldOffsets.addFirst(sample.getOldOffset(i));
@@ -900,8 +800,7 @@ public class FinallyProcessor {
       newblock.setSeq(seq);
       newblock.getInstrOldOffsets().addAll(oldOffsets);
 
-      List<BasicBlock> lstTemp = new ArrayList<BasicBlock>();
-      lstTemp.addAll(sample.getSuccs());
+      List<BasicBlock> lstTemp = new ArrayList<>(sample.getSuccs());
 
       // move successors
       for (BasicBlock suc : lstTemp) {
@@ -933,19 +832,15 @@ public class FinallyProcessor {
   }
 
   public boolean equalInstructions(Instruction first, Instruction second, List<int[]> lstStoreVars) {
-    if (first.opcode != second.opcode || first.wide != second.wide
-        || first.operandsCount() != second.operandsCount()) {
+    if (!Instruction.equals(first, second)) {
       return false;
     }
 
-    if (first.group != CodeConstants.GROUP_JUMP && first.getOperands() != null) { // FIXME: switch comparison
-      for (int i = 0; i < first.getOperands().length; i++) {
-
-        int firstOp = first.getOperand(i);
-        int secondOp = second.getOperand(i);
-
+    if (first.group != CodeConstants.GROUP_JUMP) { // FIXME: switch comparison
+      for (int i = 0; i < first.operandsCount(); i++) {
+        int firstOp = first.operand(i);
+        int secondOp = second.operand(i);
         if (firstOp != secondOp) {
-
           // a-load/store instructions
           if (first.opcode == CodeConstants.opc_aload || first.opcode == CodeConstants.opc_astore) {
             for (int[] arr : lstStoreVars) {
@@ -964,7 +859,6 @@ public class FinallyProcessor {
   }
 
   private static void deleteArea(ControlFlowGraph graph, Area area) {
-
     BasicBlock start = area.start;
     BasicBlock next = area.next;
 
@@ -978,14 +872,14 @@ public class FinallyProcessor {
     }
 
     // collect common exception ranges of predecessors and successors
-    Set<BasicBlock> setCommonExceptionHandlers = new HashSet<BasicBlock>(next.getSuccExceptions());
+    Set<BasicBlock> setCommonExceptionHandlers = new HashSet<>(next.getSuccExceptions());
     for (BasicBlock pred : start.getPreds()) {
       setCommonExceptionHandlers.retainAll(pred.getSuccExceptions());
     }
 
     boolean is_outside_range = false;
 
-    Set<BasicBlock> setPredecessors = new HashSet<BasicBlock>(start.getPreds());
+    Set<BasicBlock> setPredecessors = new HashSet<>(start.getPreds());
 
     // replace start with next
     for (BasicBlock pred : setPredecessors) {
@@ -1007,7 +901,7 @@ public class FinallyProcessor {
           is_outside_range = true;
         }
 
-        Set<ExceptionRangeCFG> setRemovedExceptionRanges = new HashSet<ExceptionRangeCFG>();
+        Set<ExceptionRangeCFG> setRemovedExceptionRanges = new HashSet<>();
         for (BasicBlock handler : block.getSuccExceptions()) {
           setRemovedExceptionRanges.add(graph.getExceptionRange(handler, block));
         }
@@ -1022,7 +916,7 @@ public class FinallyProcessor {
         // shift extern edges on splitted blocks
         if (block.getSeq().isEmpty() && block.getSuccs().size() == 1) {
           BasicBlock succs = block.getSuccs().get(0);
-          for (BasicBlock pred : new ArrayList<BasicBlock>(block.getPreds())) {
+          for (BasicBlock pred : new ArrayList<>(block.getPreds())) {
             if (!setBlocks.contains(pred)) {
               pred.replaceSuccessor(block, succs);
             }
@@ -1038,18 +932,15 @@ public class FinallyProcessor {
     }
 
     if (is_outside_range) {
-
       // new empty block
       BasicBlock emptyblock = new BasicBlock(++graph.last_id);
 
       graph.getBlocks().addWithKey(emptyblock, emptyblock.id);
 
       // add to ranges if necessary
-      if (setCommonRemovedExceptionRanges != null) {
-        for (ExceptionRangeCFG range : setCommonRemovedExceptionRanges) {
-          emptyblock.addSuccessorException(range.getHandler());
-          range.getProtectedRange().add(emptyblock);
-        }
+      for (ExceptionRangeCFG range : setCommonRemovedExceptionRanges) {
+        emptyblock.addSuccessorException(range.getHandler());
+        range.getProtectedRange().add(emptyblock);
       }
 
       // insert between predecessors and next
@@ -1061,7 +952,6 @@ public class FinallyProcessor {
   }
 
   private static void removeExceptionInstructionsEx(BasicBlock block, int blocktype, int finallytype) {
-
     InstructionSequence seq = block.getSeq();
 
     if (finallytype == 3) { // empty finally handler
@@ -1087,4 +977,4 @@ public class FinallyProcessor {
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
index 40d94fd..9598b3c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -25,7 +11,6 @@ import org.jetbrains.java.decompiler.struct.attr.StructAnnotationAttribute;
 import org.jetbrains.java.decompiler.struct.attr.StructAnnotationParameterAttribute;
 import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
-import org.jetbrains.java.decompiler.util.VBStyleCollection;
 
 import java.util.List;
 
@@ -85,11 +70,10 @@ public class IdeaNotNullHelper {
             boolean thisvar = !mt.hasModifier(CodeConstants.ACC_STATIC);
 
             MethodDescriptor md = MethodDescriptor.parseDescriptor(mt.getDescriptor());
-            VBStyleCollection<StructGeneralAttribute, String> attributes = mt.getAttributes();
 
             // parameter annotations
-            StructAnnotationParameterAttribute param_annotations = (StructAnnotationParameterAttribute)attributes
-              .getWithKey(StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS);
+            StructAnnotationParameterAttribute param_annotations =
+              mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS);
             if (param_annotations != null) {
 
               List<List<AnnotationExprent>> param_annotations_lists = param_annotations.getParamAnnotations();
@@ -109,6 +93,7 @@ public class IdeaNotNullHelper {
                     for (AnnotationExprent ann : annotations) {
                       if (ann.getClassName().equals("org/jetbrains/annotations/NotNull")) {
                         is_notnull_check = true;
+                        break;
                       }
                     }
                   }
@@ -127,7 +112,7 @@ public class IdeaNotNullHelper {
         return false;
       }
 
-      removeParameterCheck(stat, mt);
+      removeParameterCheck(stat);
 
       return true;
     }
@@ -135,7 +120,7 @@ public class IdeaNotNullHelper {
     return false;
   }
 
-  private static void removeParameterCheck(Statement stat, StructMethod mt) {
+  private static void removeParameterCheck(Statement stat) {
 
     Statement st = stat.getFirst();
     while (st.type == Statement.TYPE_SEQUENCE) {
@@ -144,11 +129,7 @@ public class IdeaNotNullHelper {
 
     IfStatement ifstat = (IfStatement)st;
 
-    if (ifstat.getElsestat() == null) { // if
-      // TODO:
-    }
-    else { // if - else
-
+    if (ifstat.getElsestat() != null) { // if - else
       StatEdge ifedge = ifstat.getIfEdge();
       StatEdge elseedge = ifstat.getElseEdge();
 
@@ -172,28 +153,22 @@ public class IdeaNotNullHelper {
 
   private static boolean findAndRemoveReturnCheck(Statement stat, StructMethod mt) {
 
-    VBStyleCollection<StructGeneralAttribute, String> attributes = mt.getAttributes();
-
     boolean is_notnull_check = false;
 
     // method annotation, refers to the return value
-    StructAnnotationAttribute attr =
-      (StructAnnotationAttribute)attributes.getWithKey(StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS);
+    StructAnnotationAttribute attr = mt.getAttribute(StructGeneralAttribute.ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS);
     if (attr != null) {
       List<AnnotationExprent> annotations = attr.getAnnotations();
 
       for (AnnotationExprent ann : annotations) {
         if (ann.getClassName().equals("org/jetbrains/annotations/NotNull")) {
           is_notnull_check = true;
+          break;
         }
       }
     }
 
-    if (is_notnull_check) {
-      return removeReturnCheck(stat, mt);
-    }
-
-    return false;
+    return is_notnull_check && removeReturnCheck(stat, mt);
   }
 
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
index 3adf70c..0e55d27 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
@@ -23,39 +9,25 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-
+import java.util.*;
 
 public class IfHelper {
-
-
   public static boolean mergeAllIfs(RootStatement root) {
-
-    boolean res = mergeAllIfsRec(root, new HashSet<Integer>());
-
+    boolean res = mergeAllIfsRec(root, new HashSet<>());
     if (res) {
       SequenceHelper.condenseSequences(root);
     }
-
     return res;
   }
 
-
-  private static boolean mergeAllIfsRec(Statement stat, HashSet<Integer> setReorderedIfs) {
-
+  private static boolean mergeAllIfsRec(Statement stat, Set<? super Integer> setReorderedIfs) {
     boolean res = false;
 
     if (stat.getExprents() == null) {
-
       while (true) {
-
         boolean changed = false;
 
         for (Statement st : stat.getStats()) {
-
           res |= mergeAllIfsRec(st, setReorderedIfs);
 
           // collapse composed if's
@@ -75,9 +47,7 @@ public class IfHelper {
     return res;
   }
 
-
-  public static boolean mergeIfs(Statement statement, HashSet<Integer> setReorderedIfs) {
-
+  public static boolean mergeIfs(Statement statement, Set<? super Integer> setReorderedIfs) {
     if (statement.type != Statement.TYPE_IF && statement.type != Statement.TYPE_SEQUENCE) {
       return false;
     }
@@ -85,10 +55,9 @@ public class IfHelper {
     boolean res = false;
 
     while (true) {
-
       boolean updated = false;
 
-      List<Statement> lst = new ArrayList<Statement>();
+      List<Statement> lst = new ArrayList<>();
       if (statement.type == Statement.TYPE_IF) {
         lst.add(statement);
       }
@@ -99,7 +68,6 @@ public class IfHelper {
       boolean stsingle = (lst.size() == 1);
 
       for (Statement stat : lst) {
-
         if (stat.type == Statement.TYPE_IF) {
           IfNode rtnode = buildGraph((IfStatement)stat, stsingle);
 
@@ -112,7 +80,6 @@ public class IfHelper {
           }
 
           if (!setReorderedIfs.contains(stat.id)) {
-
             if (updated = collapseIfElse(rtnode)) {
               break;
             }
@@ -133,14 +100,13 @@ public class IfHelper {
         break;
       }
 
-      res |= updated;
+      res |= true;
     }
 
     return res;
   }
 
   private static boolean collapseIfIf(IfNode rtnode) {
-
     if (rtnode.edgetypes.get(0) == 0) {
       IfNode ifbranch = rtnode.succs.get(0);
       if (ifbranch.succs.size() == 2) {
@@ -158,7 +124,7 @@ public class IfHelper {
             ifchild.removeSuccessor(ifchild.getAllSuccessorEdges().get(0));
             ifparent.getStats().removeWithKey(ifchild.id);
 
-            if (ifbranch.edgetypes.get(0).intValue() == 1) { // target null
+            if (ifbranch.edgetypes.get(0) == 1) { // target null
 
               ifparent.setIfstat(null);
 
@@ -196,7 +162,7 @@ public class IfHelper {
             // merge if conditions
             IfExprent statexpr = ifparent.getHeadexprent();
 
-            List<Exprent> lstOperands = new ArrayList<Exprent>();
+            List<Exprent> lstOperands = new ArrayList<>();
             lstOperands.add(statexpr.getCondition());
             lstOperands.add(ifchild.getHeadexprent().getCondition());
 
@@ -213,11 +179,9 @@ public class IfHelper {
   }
 
   private static boolean collapseIfElse(IfNode rtnode) {
-
-    if (rtnode.edgetypes.get(0).intValue() == 0) {
+    if (rtnode.edgetypes.get(0) == 0) {
       IfNode ifbranch = rtnode.succs.get(0);
       if (ifbranch.succs.size() == 2) {
-
         // if-else branch
         if (ifbranch.succs.get(0).value == rtnode.succs.get(1).value) {
 
@@ -230,8 +194,8 @@ public class IfHelper {
             ifchild.getFirst().removeSuccessor(ifchild.getIfEdge());
             ifparent.getStats().removeWithKey(ifchild.id);
 
-            if (ifbranch.edgetypes.get(1).intValue() == 1 &&
-                ifbranch.edgetypes.get(0).intValue() == 1) { // target null
+            if (ifbranch.edgetypes.get(1) == 1 &&
+                ifbranch.edgetypes.get(0) == 1) { // target null
 
               ifparent.setIfstat(null);
 
@@ -250,7 +214,7 @@ public class IfHelper {
             // merge if conditions
             IfExprent statexpr = ifparent.getHeadexprent();
 
-            List<Exprent> lstOperands = new ArrayList<Exprent>();
+            List<Exprent> lstOperands = new ArrayList<>();
             lstOperands.add(statexpr.getCondition());
             lstOperands.add(new FunctionExprent(FunctionExprent.FUNCTION_BOOL_NOT, ifchild.getHeadexprent().getCondition(), null));
             statexpr.setCondition(new FunctionExprent(FunctionExprent.FUNCTION_CADD, lstOperands, null));
@@ -265,10 +229,8 @@ public class IfHelper {
     return false;
   }
 
-
   private static boolean collapseElse(IfNode rtnode) {
-
-    if (rtnode.edgetypes.get(1).intValue() == 0) {
+    if (rtnode.edgetypes.get(1) == 0) {
       IfNode elsebranch = rtnode.succs.get(1);
       if (elsebranch.succs.size() == 2) {
 
@@ -305,7 +267,7 @@ public class IfHelper {
             // merge if conditions
             IfExprent statexpr = secondif.getHeadexprent();
 
-            List<Exprent> lstOperands = new ArrayList<Exprent>();
+            List<Exprent> lstOperands = new ArrayList<>();
             lstOperands.add(firstif.getHeadexprent().getCondition());
 
             if (path == 2) {
@@ -328,9 +290,7 @@ public class IfHelper {
         }
       }
       else if (elsebranch.succs.size() == 1) {
-
         if (elsebranch.succs.get(0).value == rtnode.succs.get(0).value) {
-
           IfStatement firstif = (IfStatement)rtnode.value;
           Statement second = elsebranch.value;
 
@@ -369,9 +329,7 @@ public class IfHelper {
     return false;
   }
 
-
   private static IfNode buildGraph(IfStatement stat, boolean stsingle) {
-
     if (stat.iftype == IfStatement.IFTYPE_IFELSE) {
       return null;
     }
@@ -433,16 +391,14 @@ public class IfHelper {
     return res;
   }
 
-
   // FIXME: rewrite the entire method!!! keep in mind finally exits!!
   private static boolean reorderIf(IfStatement ifstat) {
-
     if (ifstat.iftype == IfStatement.IFTYPE_IFELSE) {
       return false;
     }
 
-    boolean ifdirect = false, elsedirect = false;
-    boolean noifstat = false, noelsestat = false;
+    boolean ifdirect, elsedirect;
+    boolean noifstat = false, noelsestat;
     boolean ifdirectpath = false, elsedirectpath = false;
 
     Statement parent = ifstat.getParent();
@@ -453,32 +409,20 @@ public class IfHelper {
     if (ifstat.getIfstat() == null) {
       noifstat = true;
 
-      if (ifstat.getIfEdge().getType() == StatEdge.TYPE_FINALLYEXIT) {
-        ifdirect = true;
-      }
-      else {
-        ifdirect = MergeHelper.isDirectPath(from, ifstat.getIfEdge().getDestination());
-      }
+      ifdirect = ifstat.getIfEdge().getType() == StatEdge.TYPE_FINALLYEXIT ||
+                 MergeHelper.isDirectPath(from, ifstat.getIfEdge().getDestination());
     }
     else {
       List<StatEdge> lstSuccs = ifstat.getIfstat().getAllSuccessorEdges();
-      if (!lstSuccs.isEmpty() && lstSuccs.get(0).getType() == StatEdge.TYPE_FINALLYEXIT) {
-        ifdirect = true;
-      }
-      else {
-        ifdirect = hasDirectEndEdge(ifstat.getIfstat(), from);
-      }
+      ifdirect = !lstSuccs.isEmpty() && lstSuccs.get(0).getType() == StatEdge.TYPE_FINALLYEXIT ||
+                 hasDirectEndEdge(ifstat.getIfstat(), from);
     }
 
     Statement last = parent.type == Statement.TYPE_SEQUENCE ? parent.getStats().getLast() : ifstat;
     noelsestat = (last == ifstat);
 
-    if (!last.getAllSuccessorEdges().isEmpty() && last.getAllSuccessorEdges().get(0).getType() == StatEdge.TYPE_FINALLYEXIT) {
-      elsedirect = true;
-    }
-    else {
-      elsedirect = hasDirectEndEdge(last, from);
-    }
+    elsedirect = !last.getAllSuccessorEdges().isEmpty() && last.getAllSuccessorEdges().get(0).getType() == StatEdge.TYPE_FINALLYEXIT ||
+                 hasDirectEndEdge(last, from);
 
     if (!noelsestat && existsPath(ifstat, ifstat.getAllSuccessorEdges().get(0).getDestination())) {
       return false;
@@ -509,7 +453,7 @@ public class IfHelper {
       SequenceStatement sequence = (SequenceStatement)parent;
 
       // build and cut the new else statement
-      List<Statement> lst = new ArrayList<Statement>();
+      List<Statement> lst = new ArrayList<>();
       for (int i = sequence.getStats().size() - 1; i >= 0; i--) {
         Statement sttemp = sequence.getStats().get(i);
         if (sttemp == ifstat) {
@@ -597,7 +541,7 @@ public class IfHelper {
         SequenceStatement sequence = (SequenceStatement)parent;
 
         // build and cut the new else statement
-        List<Statement> lst = new ArrayList<Statement>();
+        List<Statement> lst = new ArrayList<>();
         for (int i = sequence.getStats().size() - 1; i >= 0; i--) {
           Statement sttemp = sequence.getStats().get(i);
           if (sttemp == ifstat) {
@@ -698,9 +642,7 @@ public class IfHelper {
     return false;
   }
 
-
   private static Statement getNextStatement(Statement stat) {
-
     Statement parent = stat.getParent();
     switch (parent.type) {
       case Statement.TYPE_ROOT:
@@ -722,7 +664,6 @@ public class IfHelper {
   }
 
   private static boolean existsPath(Statement from, Statement to) {
-
     for (StatEdge edge : to.getAllPredecessorEdges()) {
       if (from.containsStatementStrict(edge.getSource())) {
         return true;
@@ -734,17 +675,16 @@ public class IfHelper {
 
   private static class IfNode {
     public final Statement value;
+    public final List<IfNode> succs = new ArrayList<>();
+    public final List<Integer> edgetypes = new ArrayList<>();
 
-    public final List<IfNode> succs = new ArrayList<IfNode>();
-    public final List<Integer> edgetypes = new ArrayList<Integer>();
-
-    public IfNode(Statement value) {
+    IfNode(Statement value) {
       this.value = value;
     }
 
     public void addChild(IfNode child, int type) {
       succs.add(child);
-      edgetypes.add(new Integer(type));
+      edgetypes.add(type);
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
index adeda02..f6ee600 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.stats.*;
@@ -68,7 +54,7 @@ public class InlineSingleBlockHelper {
     Statement parent = source.getParent();
     source.removeSuccessor(edge);
 
-    List<Statement> lst = new ArrayList<Statement>();
+    List<Statement> lst = new ArrayList<>();
     for (int i = seq.getStats().size() - 1; i >= index; i--) {
       lst.add(0, seq.getStats().remove(i));
     }
@@ -132,17 +118,14 @@ public class InlineSingleBlockHelper {
       StatEdge edge = lst.get(0);
 
       if (sameCatchRanges(edge)) {
-        if (edge.explicit) {
-          return true;
-        }
-        else {
+        if (!edge.explicit) {
           for (int i = index; i < seq.getStats().size(); i++) {
             if (!noExitLabels(seq.getStats().get(i), seq)) {
               return false;
             }
           }
-          return true;
         }
+        return true;
       }
       // FIXME: count labels properly
     }
@@ -200,21 +183,13 @@ public class InlineSingleBlockHelper {
   }
 
   public static boolean isBreakEdgeLabeled(Statement source, Statement closure) {
-
     if (closure.type == Statement.TYPE_DO || closure.type == Statement.TYPE_SWITCH) {
-
       Statement parent = source.getParent();
-
-      if (parent == closure) {
-        return false;
-      }
-      else {
-        return parent.type == Statement.TYPE_DO || parent.type == Statement.TYPE_SWITCH ||
-               isBreakEdgeLabeled(parent, closure);
-      }
+      return parent != closure &&
+             (parent.type == Statement.TYPE_DO || parent.type == Statement.TYPE_SWITCH || isBreakEdgeLabeled(parent, closure));
     }
     else {
       return true;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
index 26cc638..9c150b5 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
@@ -33,7 +19,7 @@ public class LabelHelper {
 
     liftClosures(root);
 
-    lowContinueLabels(root, new HashSet<StatEdge>());
+    lowContinueLabels(root, new HashSet<>());
 
     lowClosures(root);
   }
@@ -63,7 +49,7 @@ public class LabelHelper {
           if (dest.type != Statement.TYPE_DUMMYEXIT) {
             Statement parent = dest.getParent();
 
-            List<Statement> lst = new ArrayList<Statement>();
+            List<Statement> lst = new ArrayList<>();
             if (parent.type == Statement.TYPE_SEQUENCE) {
               lst.addAll(parent.getStats());
             }
@@ -131,14 +117,14 @@ public class LabelHelper {
         lowContinueLabels(st, edges);
       }
       else {
-        lowContinueLabels(st, new HashSet<StatEdge>());
+        lowContinueLabels(st, new HashSet<>());
       }
     }
   }
 
   public static void lowClosures(Statement stat) {
 
-    for (StatEdge edge : new ArrayList<StatEdge>(stat.getLabelEdges())) {
+    for (StatEdge edge : new ArrayList<>(stat.getLabelEdges())) {
 
       if (edge.getType() == StatEdge.TYPE_BREAK) {  // FIXME: ?
         for (Statement st : stat.getStats()) {
@@ -181,7 +167,7 @@ public class LabelHelper {
 
   private static HashMap<Statement, List<StatEdge>> setExplicitEdges(Statement stat) {
 
-    HashMap<Statement, List<StatEdge>> mapEdges = new HashMap<Statement, List<StatEdge>>();
+    HashMap<Statement, List<StatEdge>> mapEdges = new HashMap<>();
 
     if (stat.getExprents() != null) {
       return mapEdges;
@@ -279,7 +265,7 @@ public class LabelHelper {
           Statement stlast = swst.getCaseStatements().get(last);
           if (stlast.getExprents() != null && stlast.getExprents().isEmpty()) {
             StatEdge edge = stlast.getAllSuccessorEdges().get(0);
-            mapEdges.put(edge.getDestination(), new ArrayList<StatEdge>(Arrays.asList(new StatEdge[]{edge})));
+            mapEdges.put(edge.getDestination(), new ArrayList<>(Collections.singletonList(edge)));
           }
           else {
             mapEdges = setExplicitEdges(stlast);
@@ -340,7 +326,7 @@ public class LabelHelper {
             edge.explicit = false;
           }
 
-          mapEdges.put(newedge.getDestination(), new ArrayList<StatEdge>(Arrays.asList(new StatEdge[]{newedge})));
+          mapEdges.put(newedge.getDestination(), new ArrayList<>(Collections.singletonList(newedge)));
         }
       }
     }
@@ -388,7 +374,7 @@ public class LabelHelper {
     }
 
     if (statedge != null) {
-      mapEdges.put(statedge.getDestination(), new ArrayList<StatEdge>(Arrays.asList(new StatEdge[]{statedge})));
+      mapEdges.put(statedge.getDestination(), new ArrayList<>(Collections.singletonList(statedge)));
     }
   }
 
@@ -420,24 +406,26 @@ public class LabelHelper {
     }
   }
 
-  private static HashSet<Statement>[] processStatementLabel(Statement stat) {
+  private static class LabelSets {
+    private final Set<Statement> breaks = new HashSet<>();
+    private final Set<Statement> continues = new HashSet<>();
+  }
 
-    HashSet<Statement> setBreak = new HashSet<Statement>();
-    HashSet<Statement> setContinue = new HashSet<Statement>();
+  private static LabelSets processStatementLabel(Statement stat) {
+    LabelSets sets = new LabelSets();
 
     if (stat.getExprents() == null) {
       for (Statement st : stat.getStats()) {
-        HashSet<Statement>[] arr = processStatementLabel(st);
-
-        setBreak.addAll(arr[0]);
-        setContinue.addAll(arr[1]);
+        LabelSets nested = processStatementLabel(st);
+        sets.breaks.addAll(nested.breaks);
+        sets.continues.addAll(nested.continues);
       }
 
       boolean shieldType = (stat.type == Statement.TYPE_DO || stat.type == Statement.TYPE_SWITCH);
       if (shieldType) {
         for (StatEdge edge : stat.getLabelEdges()) {
-          if (edge.explicit && ((edge.getType() == StatEdge.TYPE_BREAK && setBreak.contains(edge.getSource())) ||
-                                (edge.getType() == StatEdge.TYPE_CONTINUE && setContinue.contains(edge.getSource())))) {
+          if (edge.explicit && ((edge.getType() == StatEdge.TYPE_BREAK && sets.breaks.contains(edge.getSource())) ||
+                                (edge.getType() == StatEdge.TYPE_CONTINUE && sets.continues.contains(edge.getSource())))) {
             edge.labeled = false;
           }
         }
@@ -445,16 +433,16 @@ public class LabelHelper {
 
       switch (stat.type) {
         case Statement.TYPE_DO:
-          setContinue.clear();
+          sets.continues.clear();
         case Statement.TYPE_SWITCH:
-          setBreak.clear();
+          sets.breaks.clear();
       }
     }
 
-    setBreak.add(stat);
-    setContinue.add(stat);
+    sets.breaks.add(stat);
+    sets.continues.add(stat);
 
-    return new HashSet[] { setBreak, setContinue };
+    return sets;
   }
 
   public static void replaceContinueWithBreak(Statement stat) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
index d5c9e8f..8229127 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.stats.DoStatement;
@@ -72,9 +58,7 @@ public class LoopExtractHelper {
     return res ? 1 : 0;
   }
 
-
   private static boolean extractLoop(DoStatement stat) {
-
     if (stat.getLooptype() != DoStatement.LOOP_DO) {
       return false;
     }
@@ -85,12 +69,7 @@ public class LoopExtractHelper {
       }
     }
 
-    if (!extractLastIf(stat)) {
-      return extractFirstIf(stat);
-    }
-    else {
-      return true;
-    }
+    return extractLastIf(stat) || extractFirstIf(stat);
   }
 
   private static boolean extractLastIf(DoStatement stat) {
@@ -189,7 +168,7 @@ public class LoopExtractHelper {
 
     loop.addSuccessor(new StatEdge(StatEdge.TYPE_REGULAR, loop, target));
 
-    for (StatEdge edge : new ArrayList<StatEdge>(block.getLabelEdges())) {
+    for (StatEdge edge : new ArrayList<>(block.getLabelEdges())) {
       if (edge.getType() == StatEdge.TYPE_CONTINUE || edge == ifedge) {
         loop.addLabeledEdge(edge);
       }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/LowBreakHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LowBreakHelper.java
deleted file mode 100644
index 67e9248..0000000
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/LowBreakHelper.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.modules.decompiler;
-
-import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement;
-import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
-import org.jetbrains.java.decompiler.modules.decompiler.stats.SynchronizedStatement;
-
-import java.util.List;
-
-public class LowBreakHelper {
-
-  public static void lowBreakLabels(Statement root) {
-
-    lowBreakLabelsRec(root);
-
-    liftBreakLabels(root);
-  }
-
-  private static void lowBreakLabelsRec(Statement stat) {
-
-    while (true) {
-
-      boolean found = false;
-
-      for (StatEdge edge : stat.getLabelEdges()) {
-        if (edge.getType() == StatEdge.TYPE_BREAK) {
-          Statement minclosure = getMinClosure(stat, edge.getSource());
-          if (minclosure != stat) {
-            minclosure.addLabeledEdge(edge);
-            edge.labeled = isBreakEdgeLabeled(edge.getSource(), minclosure);
-            found = true;
-            break;
-          }
-        }
-      }
-
-      if (!found) {
-        break;
-      }
-    }
-
-    for (Statement st : stat.getStats()) {
-      lowBreakLabelsRec(st);
-    }
-  }
-
-  public static boolean isBreakEdgeLabeled(Statement source, Statement closure) {
-
-    if (closure.type == Statement.TYPE_DO || closure.type == Statement.TYPE_SWITCH) {
-
-      Statement parent = source.getParent();
-
-      if (parent == closure) {
-        return false;
-      }
-      else {
-        return isBreakEdgeLabeled(parent, closure) ||
-               (parent.type == Statement.TYPE_DO || parent.type == Statement.TYPE_SWITCH);
-      }
-    }
-    else {
-      return true;
-    }
-  }
-
-  public static Statement getMinClosure(Statement closure, Statement source) {
-
-    while (true) {
-
-      Statement newclosure = null;
-
-      switch (closure.type) {
-        case Statement.TYPE_SEQUENCE:
-          Statement last = closure.getStats().getLast();
-
-          if (isOkClosure(closure, source, last)) {
-            newclosure = last;
-          }
-          break;
-        case Statement.TYPE_IF:
-          IfStatement ifclosure = (IfStatement)closure;
-          if (isOkClosure(closure, source, ifclosure.getIfstat())) {
-            newclosure = ifclosure.getIfstat();
-          }
-          else if (isOkClosure(closure, source, ifclosure.getElsestat())) {
-            newclosure = ifclosure.getElsestat();
-          }
-          break;
-        case Statement.TYPE_TRYCATCH:
-          for (Statement st : closure.getStats()) {
-            if (isOkClosure(closure, source, st)) {
-              newclosure = st;
-              break;
-            }
-          }
-          break;
-        case Statement.TYPE_SYNCRONIZED:
-          Statement body = ((SynchronizedStatement)closure).getBody();
-
-          if (isOkClosure(closure, source, body)) {
-            newclosure = body;
-          }
-      }
-
-      if (newclosure == null) {
-        break;
-      }
-
-      closure = newclosure;
-    }
-
-    return closure;
-  }
-
-  private static boolean isOkClosure(Statement closure, Statement source, Statement stat) {
-
-    boolean ok = false;
-
-    if (stat != null && stat.containsStatementStrict(source)) {
-
-      List<StatEdge> lst = stat.getAllSuccessorEdges();
-
-      ok = lst.isEmpty();
-      if (!ok) {
-        StatEdge edge = lst.get(0);
-        ok = (edge.closure == closure && edge.getType() == StatEdge.TYPE_BREAK);
-      }
-    }
-
-    return ok;
-  }
-
-
-  private static void liftBreakLabels(Statement stat) {
-
-    for (Statement st : stat.getStats()) {
-      liftBreakLabels(st);
-    }
-
-
-    while (true) {
-
-      boolean found = false;
-
-      for (StatEdge edge : stat.getLabelEdges()) {
-        if (edge.explicit && edge.labeled && edge.getType() == StatEdge.TYPE_BREAK) {
-
-          Statement newclosure = getMaxBreakLift(stat, edge);
-
-          if (newclosure != null) {
-            newclosure.addLabeledEdge(edge);
-            edge.labeled = isBreakEdgeLabeled(edge.getSource(), newclosure);
-
-            found = true;
-            break;
-          }
-        }
-      }
-
-      if (!found) {
-        break;
-      }
-    }
-  }
-
-  private static Statement getMaxBreakLift(Statement stat, StatEdge edge) {
-
-    Statement closure = null;
-    Statement newclosure = stat;
-
-    while ((newclosure = getNextBreakLift(newclosure, edge)) != null) {
-      closure = newclosure;
-    }
-
-    return closure;
-  }
-
-  private static Statement getNextBreakLift(Statement stat, StatEdge edge) {
-
-    Statement closure = stat.getParent();
-
-    while (closure != null && !closure.containsStatementStrict(edge.getDestination())) {
-
-      boolean labeled = isBreakEdgeLabeled(edge.getSource(), closure);
-      if (closure.isLabeled() || !labeled) {
-        return closure;
-      }
-
-      closure = closure.getParent();
-    }
-
-    return null;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
index 71d3d79..ed9f368 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
@@ -27,16 +13,12 @@ import java.util.List;
 import java.util.Set;
 
 public class MergeHelper {
-
   public static void enhanceLoops(Statement root) {
-
-    while (enhanceLoopsRec(root)) ;
-
+    while (enhanceLoopsRec(root)) /**/;
     SequenceHelper.condenseSequences(root);
   }
 
   private static boolean enhanceLoopsRec(Statement stat) {
-
     boolean res = false;
 
     for (Statement st : stat.getStats()) {
@@ -53,7 +35,6 @@ public class MergeHelper {
   }
 
   private static boolean enhanceLoop(DoStatement stat) {
-
     int oldloop = stat.getLooptype();
 
     switch (oldloop) {
@@ -77,8 +58,7 @@ public class MergeHelper {
     return (stat.getLooptype() != oldloop);
   }
 
-  private static boolean matchDoWhile(DoStatement stat) {
-
+  private static void matchDoWhile(DoStatement stat) {
     // search for an if condition at the end of the loop
     Statement last = stat.getFirst();
     while (last.type == Statement.TYPE_SEQUENCE) {
@@ -100,10 +80,9 @@ public class MergeHelper {
           set.remove(last);
 
           if (!set.isEmpty()) {
-            return false;
+            return;
           }
 
-
           stat.setLooptype(DoStatement.LOOP_DOWHILE);
 
           IfExprent ifexpr = (IfExprent)lastif.getHeadexprent().copy();
@@ -135,12 +114,9 @@ public class MergeHelper {
             }
             stat.addSuccessor(edge);
           }
-
-          return true;
         }
       }
     }
-    return false;
   }
 
   private static boolean matchWhile(DoStatement stat) {
@@ -185,7 +161,7 @@ public class MergeHelper {
               if (firstif == stat.getFirst()) {
                 BasicBlockStatement bstat = new BasicBlockStatement(new BasicBlock(
                   DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.STATEMENT_COUNTER)));
-                bstat.setExprents(new ArrayList<Exprent>());
+                bstat.setExprents(new ArrayList<>());
                 stat.replaceStatement(firstif, bstat);
               }
               else {
@@ -224,7 +200,7 @@ public class MergeHelper {
               if (firstif.getIfstat() == null) {
                 BasicBlockStatement bstat = new BasicBlockStatement(new BasicBlock(
                   DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.STATEMENT_COUNTER)));
-                bstat.setExprents(new ArrayList<Exprent>());
+                bstat.setExprents(new ArrayList<>());
 
                 ifedge.setSource(bstat);
                 bstat.addSuccessor(ifedge);
@@ -291,15 +267,14 @@ public class MergeHelper {
     }
   }
 
-  private static boolean matchFor(DoStatement stat) {
-
-    Exprent lastDoExprent = null, initDoExprent = null;
-    Statement lastData = null, preData = null;
+  private static void matchFor(DoStatement stat) {
+    Exprent lastDoExprent, initDoExprent;
+    Statement lastData, preData = null;
 
     // get last exprent
     lastData = getLastDirectData(stat.getFirst());
     if (lastData == null || lastData.getExprents().isEmpty()) {
-      return false;
+      return;
     }
 
     List<Exprent> lstExpr = lastData.getExprents();
@@ -312,11 +287,9 @@ public class MergeHelper {
       }
     }
 
-    boolean haslast = issingle || (lastDoExprent.type == Exprent.EXPRENT_ASSIGNMENT ||
-                                   lastDoExprent.type == Exprent.EXPRENT_FUNCTION);
-
+    boolean haslast = issingle || lastDoExprent.type == Exprent.EXPRENT_ASSIGNMENT || lastDoExprent.type == Exprent.EXPRENT_FUNCTION;
     if (!haslast) {
-      return false;
+      return;
     }
 
     boolean hasinit = false;
@@ -350,13 +323,12 @@ public class MergeHelper {
       }
     }
 
-    if ((hasinit && haslast) || issingle) {  // FIXME: issingle sufficient?
-
+    if (hasinit || issingle) {  // FIXME: issingle sufficient?
       Set<Statement> set = stat.getNeighboursSet(StatEdge.TYPE_CONTINUE, Statement.DIRECTION_BACKWARD);
       set.remove(lastData);
 
       if (!set.isEmpty()) {
-        return false;
+        return;
       }
 
       stat.setLooptype(DoStatement.LOOP_FOR);
@@ -373,8 +345,6 @@ public class MergeHelper {
       }
       removeLastEmptyStatement(stat, lastData);
     }
-
-    return true;
   }
 
   private static void removeLastEmptyStatement(DoStatement dostat, Statement stat) {
@@ -382,7 +352,7 @@ public class MergeHelper {
     if (stat == dostat.getFirst()) {
       BasicBlockStatement bstat = new BasicBlockStatement(new BasicBlock(
         DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.STATEMENT_COUNTER)));
-      bstat.setExprents(new ArrayList<Exprent>());
+      bstat.setExprents(new ArrayList<>());
       dostat.replaceStatement(stat, bstat);
     }
     else {
@@ -402,20 +372,18 @@ public class MergeHelper {
   }
 
   private static Statement getLastDirectData(Statement stat) {
-
     if (stat.getExprents() != null) {
       return stat;
     }
 
-    switch (stat.type) {
-      case Statement.TYPE_SEQUENCE:
-        for (int i = stat.getStats().size() - 1; i >= 0; i--) {
-          Statement tmp = getLastDirectData(stat.getStats().get(i));
-          if (tmp == null || !tmp.getExprents().isEmpty()) {
-            return tmp;
-          }
+    if (stat.type == Statement.TYPE_SEQUENCE) {
+      for (int i = stat.getStats().size() - 1; i >= 0; i--) {
+        Statement tmp = getLastDirectData(stat.getStats().get(i));
+        if (tmp == null || !tmp.getExprents().isEmpty()) {
+          return tmp;
         }
+      }
     }
     return null;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
index 4eb366b..d73535f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
@@ -38,10 +24,10 @@ public class PPandMMHelper {
     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
     DirectGraph dgraph = flatthelper.buildDirectGraph(root);
 
-    LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
+    LinkedList<DirectNode> stack = new LinkedList<>();
     stack.add(dgraph.first);
 
-    HashSet<DirectNode> setVisited = new HashSet<DirectNode>();
+    HashSet<DirectNode> setVisited = new HashSet<>();
 
     boolean res = false;
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/PrimitiveExprsList.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PrimitiveExprsList.java
index 0a1831e..d3ce7d7 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/PrimitiveExprsList.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/PrimitiveExprsList.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
@@ -22,7 +8,7 @@ import java.util.List;
 
 public class PrimitiveExprsList {
 
-  private final List<Exprent> lstExprents = new ArrayList<Exprent>();
+  private final List<Exprent> lstExprents = new ArrayList<>();
 
   private ExprentStack stack = new ExprentStack();
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
index f57457c..a7c804b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -43,7 +29,7 @@ public class SecondaryFunctionsHelper {
     FunctionExprent.FUNCTION_CADD
   };
 
-  private static final HashMap<Integer, Integer[]> mapNumComparisons = new HashMap<Integer, Integer[]>();
+  private static final HashMap<Integer, Integer[]> mapNumComparisons = new HashMap<>();
 
   static {
     mapNumComparisons.put(FunctionExprent.FUNCTION_EQ,
@@ -56,9 +42,7 @@ public class SecondaryFunctionsHelper {
     mapNumComparisons.put(FunctionExprent.FUNCTION_LE, new Integer[]{FunctionExprent.FUNCTION_LT, FunctionExprent.FUNCTION_LE, null});
   }
 
-
-  public static boolean identifySecondaryFunctions(Statement stat) {
-
+  public static boolean identifySecondaryFunctions(Statement stat, VarProcessor varProc) {
     if (stat.getExprents() == null) {
       // if(){;}else{...} -> if(!){...}
       if (stat.type == Statement.TYPE_IF) {
@@ -100,24 +84,23 @@ public class SecondaryFunctionsHelper {
       }
     }
 
-
     boolean replaced = true;
     while (replaced) {
       replaced = false;
 
-      List<Object> lstObjects = new ArrayList<Object>(stat.getExprents() == null ? stat.getSequentialObjects() : stat.getExprents());
+      List<Object> lstObjects = new ArrayList<>(stat.getExprents() == null ? stat.getSequentialObjects() : stat.getExprents());
 
       for (int i = 0; i < lstObjects.size(); i++) {
         Object obj = lstObjects.get(i);
 
         if (obj instanceof Statement) {
-          if (identifySecondaryFunctions((Statement)obj)) {
+          if (identifySecondaryFunctions((Statement)obj, varProc)) {
             replaced = true;
             break;
           }
         }
         else if (obj instanceof Exprent) {
-          Exprent retexpr = identifySecondaryFunctions((Exprent)obj, true);
+          Exprent retexpr = identifySecondaryFunctions((Exprent)obj, true, varProc);
           if (retexpr != null) {
             if (stat.getExprents() == null) {
               // only head expressions can be replaced!
@@ -136,9 +119,7 @@ public class SecondaryFunctionsHelper {
     return false;
   }
 
-
-  private static Exprent identifySecondaryFunctions(Exprent exprent, boolean statement_level) {
-
+  private static Exprent identifySecondaryFunctions(Exprent exprent, boolean statement_level, VarProcessor varProc) {
     if (exprent.type == Exprent.EXPRENT_FUNCTION) {
       FunctionExprent fexpr = (FunctionExprent)exprent;
 
@@ -183,7 +164,7 @@ public class SecondaryFunctionsHelper {
                 if (index >= 0 && index <= 2) {
                   Integer destcon = destcons[index];
                   if (destcon != null) {
-                    desttype = destcon.intValue();
+                    desttype = destcon;
                   }
                 }
               }
@@ -202,7 +183,7 @@ public class SecondaryFunctionsHelper {
       replaced = false;
 
       for (Exprent expr : exprent.getAllExprents()) {
-        Exprent retexpr = identifySecondaryFunctions(expr, false);
+        Exprent retexpr = identifySecondaryFunctions(expr, false, varProc);
         if (retexpr != null) {
           exprent.replaceExprent(expr, retexpr);
           replaced = true;
@@ -227,14 +208,14 @@ public class SecondaryFunctionsHelper {
                 ConstExprent cexpr = (ConstExprent)operand;
                 long val;
                 if (operandtype.type == CodeConstants.TYPE_LONG) {
-                  val = ((Long)cexpr.getValue()).longValue();
+                  val = (Long)cexpr.getValue();
                 }
                 else {
-                  val = ((Integer)cexpr.getValue()).intValue();
+                  val = (Integer)cexpr.getValue();
                 }
 
                 if (val == -1) {
-                  List<Exprent> lstBitNotOperand = new ArrayList<Exprent>();
+                  List<Exprent> lstBitNotOperand = new ArrayList<>();
                   lstBitNotOperand.add(lstOperands.get(1 - i));
                   return new FunctionExprent(FunctionExprent.FUNCTION_BIT_NOT, lstBitNotOperand, fexpr.bytecode);
                 }
@@ -248,14 +229,14 @@ public class SecondaryFunctionsHelper {
               for (int i = 0; i < 2; i++) {
                 if (lstOperands.get(i).type == Exprent.EXPRENT_CONST) {
                   ConstExprent cexpr = (ConstExprent)lstOperands.get(i);
-                  int val = ((Integer)cexpr.getValue()).intValue();
+                  int val = (Integer)cexpr.getValue();
 
                   if ((fexpr.getFuncType() == FunctionExprent.FUNCTION_EQ && val == 1) ||
                       (fexpr.getFuncType() == FunctionExprent.FUNCTION_NE && val == 0)) {
                     return lstOperands.get(1 - i);
                   }
                   else {
-                    List<Exprent> lstNotOperand = new ArrayList<Exprent>();
+                    List<Exprent> lstNotOperand = new ArrayList<>();
                     lstNotOperand.add(lstOperands.get(1 - i));
                     return new FunctionExprent(FunctionExprent.FUNCTION_BOOL_NOT, lstNotOperand, fexpr.bytecode);
                   }
@@ -267,10 +248,10 @@ public class SecondaryFunctionsHelper {
             if (lstOperands.get(0).type == Exprent.EXPRENT_CONST) {
               int val = ((ConstExprent)lstOperands.get(0)).getIntValue();
               if (val == 0) {
-                return new ConstExprent(VarType.VARTYPE_BOOLEAN, new Integer(1), fexpr.bytecode);
+                return new ConstExprent(VarType.VARTYPE_BOOLEAN, 1, fexpr.bytecode);
               }
               else {
-                return new ConstExprent(VarType.VARTYPE_BOOLEAN, new Integer(0), fexpr.bytecode);
+                return new ConstExprent(VarType.VARTYPE_BOOLEAN, 0, fexpr.bytecode);
               }
             }
             break;
@@ -301,24 +282,23 @@ public class SecondaryFunctionsHelper {
           case FunctionExprent.FUNCTION_DCMPG:
             int var = DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER);
             VarType type = lstOperands.get(0).getExprType();
-            VarProcessor processor = (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR);
 
             FunctionExprent iff = new FunctionExprent(FunctionExprent.FUNCTION_IIF, Arrays.asList(
-              new FunctionExprent(FunctionExprent.FUNCTION_LT, Arrays.asList(new VarExprent(var, type, processor),
+              new FunctionExprent(FunctionExprent.FUNCTION_LT, Arrays.asList(new VarExprent(var, type, varProc),
                 ConstExprent.getZeroConstant(type.type)), null),
-              new ConstExprent(VarType.VARTYPE_INT, new Integer(-1), null),
-              new ConstExprent(VarType.VARTYPE_INT, new Integer(1), null)), null);
+              new ConstExprent(VarType.VARTYPE_INT, -1, null),
+              new ConstExprent(VarType.VARTYPE_INT, 1, null)), null);
 
             FunctionExprent head = new FunctionExprent(FunctionExprent.FUNCTION_EQ, Arrays.asList(
-              new AssignmentExprent(new VarExprent(var, type, processor), new FunctionExprent(FunctionExprent.FUNCTION_SUB,
-                                                                                              Arrays.asList(lstOperands.get(0),
-                                                                                                  lstOperands.get(1)), null), null),
+              new AssignmentExprent(new VarExprent(var, type, varProc),
+                                    new FunctionExprent(FunctionExprent.FUNCTION_SUB, Arrays.asList(lstOperands.get(0), lstOperands.get(1)), null),
+                                    null),
               ConstExprent.getZeroConstant(type.type)), null);
 
-            processor.setVarType(new VarVersionPair(var, 0), type);
+            varProc.setVarType(new VarVersionPair(var, 0), type);
 
             return new FunctionExprent(FunctionExprent.FUNCTION_IIF, Arrays.asList(
-              head, new ConstExprent(VarType.VARTYPE_INT, new Integer(0), null), iff), fexpr.bytecode);
+              head, new ConstExprent(VarType.VARTYPE_INT, 0, null), iff), fexpr.bytecode);
         }
         break;
       case Exprent.EXPRENT_ASSIGNMENT: // check for conditional assignment
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java
index 75bbd39..4fe4127 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java
@@ -1,24 +1,9 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.BasicBlockStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.SequenceStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
@@ -39,8 +24,7 @@ public class SequenceHelper {
 
     if (stat.type == Statement.TYPE_SEQUENCE) {
 
-      List<Statement> lst = new ArrayList<Statement>();
-      lst.addAll(stat.getStats());
+      List<Statement> lst = new ArrayList<>(stat.getStats());
 
       boolean unfolded = false;
 
@@ -84,7 +68,7 @@ public class SequenceHelper {
               st.removeSuccessor(edge);
             }
 
-            for (StatEdge edge : new HashSet<StatEdge>(st.getLabelEdges())) {
+            for (StatEdge edge : new HashSet<>(st.getLabelEdges())) {
               if (edge.getSource() != last) {
                 last.addLabeledEdge(edge);
               }
@@ -302,7 +286,7 @@ public class SequenceHelper {
     BasicBlockStatement bstat = new BasicBlockStatement(new BasicBlock(
       DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.STATEMENT_COUNTER)));
     if (stat.getExprents() == null) {
-      bstat.setExprents(new ArrayList<Exprent>());
+      bstat.setExprents(new ArrayList<>());
     }
     else {
       bstat.setExprents(DecHelper.copyExprentList(stat.getExprents()));
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
index ddf6865..72c845f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
@@ -1,44 +1,12 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.ArrayExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.AssignmentExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.ExitExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.FieldExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.MonitorExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.NewExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
 import org.jetbrains.java.decompiler.modules.decompiler.sforms.SSAConstructorSparseEx;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.IfStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
@@ -49,43 +17,58 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
-public class SimplifyExprentsHelper {
+import java.util.*;
+import java.util.Map.Entry;
+
+public class SimplifyExprentsHelper {
+  @SuppressWarnings("SpellCheckingInspection") private static final MatchEngine class14Builder = new MatchEngine(
+    "statement type:if iftype:if exprsize:-1\n" +
+    " exprent position:head type:if\n" +
+    "  exprent type:function functype:eq\n" +
+    "   exprent type:field name:$fieldname$\n" +
+    "   exprent type:constant consttype:null\n" +
+    " statement type:basicblock\n" +
+    "  exprent position:-1 type:assignment ret:$assignfield$\n" +
+    "   exprent type:var index:$var$\n" +
+    "   exprent type:field name:$fieldname$\n" +
+    " statement type:sequence statsize:2\n" +
+    "  statement type:trycatch\n" +
+    "   statement type:basicblock exprsize:1\n" +
+    "    exprent type:assignment\n" +
+    "     exprent type:var index:$var$\n" +
+    "     exprent type:invocation invclass:java/lang/Class signature:forName(Ljava/lang/String;)Ljava/lang/Class;\n" +
+    "      exprent position:0 type:constant consttype:string constvalue:$classname$\n" +
+    "   statement type:basicblock exprsize:1\n" +
+    "    exprent type:exit exittype:throw\n" +
+    "  statement type:basicblock exprsize:1\n" +
+    "   exprent type:assignment\n" +
+    "    exprent type:field name:$fieldname$ ret:$field$\n" +
+    "    exprent type:var index:$var$");
 
-  static final MatchEngine class14Builder = new MatchEngine();
-  
   private final boolean firstInvocation;
 
   public SimplifyExprentsHelper(boolean firstInvocation) {
     this.firstInvocation = firstInvocation;
   }
 
-  public boolean simplifyStackVarsStatement(Statement stat, HashSet<Integer> setReorderedIfs, SSAConstructorSparseEx ssa, StructClass cl) {
-
+  public boolean simplifyStackVarsStatement(Statement stat, Set<Integer> setReorderedIfs, SSAConstructorSparseEx ssa, StructClass cl) {
     boolean res = false;
 
-    if (stat.getExprents() == null) {
-
+    List<Exprent> expressions = stat.getExprents();
+    if (expressions == null) {
       boolean processClass14 = DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_CLASS_1_4);
 
       while (true) {
-
         boolean changed = false;
 
         for (Statement st : stat.getStats()) {
           res |= simplifyStackVarsStatement(st, setReorderedIfs, ssa, cl);
 
-          // collapse composed if's
-          if (changed = IfHelper.mergeIfs(st, setReorderedIfs)) {
-            break;
-          }
+          changed = IfHelper.mergeIfs(st, setReorderedIfs) ||  // collapse composed if's
+                    buildIff(st, ssa) ||  // collapse iff ?: statement
+                    processClass14 && collapseInlinedClass14(st);  // collapse inlined .class property in version 1.4 and before
 
-          // collapse iff ?: statement
-          if (changed = buildIff(st, ssa)) {
-            break;
-          }
-
-          // collapse inlined .class property in version 1.4 and before
-          if (processClass14 && (changed = collapseInlinedClass14(st))) {
+          if (changed) {
             break;
           }
         }
@@ -98,27 +81,23 @@ public class SimplifyExprentsHelper {
       }
     }
     else {
-      res |= simplifyStackVarsExprents(stat.getExprents(), cl);
+      res = simplifyStackVarsExprents(expressions, cl);
     }
 
     return res;
   }
 
   private boolean simplifyStackVarsExprents(List<Exprent> list, StructClass cl) {
-
     boolean res = false;
 
     int index = 0;
-
     while (index < list.size()) {
-
       Exprent current = list.get(index);
 
       Exprent ret = isSimpleConstructorInvocation(current);
       if (ret != null) {
         list.set(index, ret);
         res = true;
-
         continue;
       }
 
@@ -127,7 +106,6 @@ public class SimplifyExprentsHelper {
       if (ret != null) {
         list.set(index, ret);
         res = true;
-
         continue;
       }
 
@@ -135,7 +113,6 @@ public class SimplifyExprentsHelper {
       if (isMonitorExit(current)) {
         list.remove(index);
         res = true;
-
         continue;
       }
 
@@ -143,7 +120,6 @@ public class SimplifyExprentsHelper {
       if (isTrivialStackAssignment(current)) {
         list.remove(index);
         res = true;
-
         continue;
       }
 
@@ -151,15 +127,12 @@ public class SimplifyExprentsHelper {
         break;
       }
 
-
       Exprent next = list.get(index + 1);
 
-
       // constructor invocation
       if (isConstructorInvocationRemote(list, index)) {
         list.remove(index);
         res = true;
-
         continue;
       }
 
@@ -168,19 +141,17 @@ public class SimplifyExprentsHelper {
         if (isQualifiedNewGetClass(current, next)) {
           list.remove(index);
           res = true;
-
           continue;
         }
       }
 
       // direct initialization of an array
-      int arrcount = isArrayInitializer(list, index);
-      if (arrcount > 0) {
-        for (int i = 0; i < arrcount; i++) {
+      int arrCount = isArrayInitializer(list, index);
+      if (arrCount > 0) {
+        for (int i = 0; i < arrCount; i++) {
           list.remove(index + 1);
         }
         res = true;
-
         continue;
       }
 
@@ -188,7 +159,6 @@ public class SimplifyExprentsHelper {
       if (addArrayInitializer(current, next)) {
         list.remove(index + 1);
         res = true;
-
         continue;
       }
 
@@ -197,30 +167,26 @@ public class SimplifyExprentsHelper {
       if (func != null) {
         list.set(index, func);
         res = true;
-
         continue;
       }
 
       // expr++ and expr--
-      if (isIPPorIMM(current, next)) {
+      if (isIPPorIMM(current, next) || isIPPorIMM2(current, next)) {
         list.remove(index + 1);
         res = true;
-
         continue;
       }
 
       // assignment on stack
-      if (isStackAssignement(current, next)) {
+      if (isStackAssignment(current, next)) {
         list.remove(index + 1);
         res = true;
-
         continue;
       }
 
-      if (!firstInvocation && isStackAssignement2(current, next)) {
+      if (!firstInvocation && isStackAssignment2(current, next)) {
         list.remove(index + 1);
         res = true;
-
         continue;
       }
 
@@ -231,47 +197,42 @@ public class SimplifyExprentsHelper {
   }
 
   private static boolean addArrayInitializer(Exprent first, Exprent second) {
-
     if (first.type == Exprent.EXPRENT_ASSIGNMENT) {
       AssignmentExprent as = (AssignmentExprent)first;
 
       if (as.getRight().type == Exprent.EXPRENT_NEW && as.getLeft().type == Exprent.EXPRENT_VAR) {
-        NewExprent newex = (NewExprent)as.getRight();
+        NewExprent newExpr = (NewExprent)as.getRight();
 
-        if (!newex.getLstArrayElements().isEmpty()) {
-
-          VarExprent arrvar = (VarExprent)as.getLeft();
+        if (!newExpr.getLstArrayElements().isEmpty()) {
+          VarExprent arrVar = (VarExprent)as.getLeft();
 
           if (second.type == Exprent.EXPRENT_ASSIGNMENT) {
             AssignmentExprent aas = (AssignmentExprent)second;
             if (aas.getLeft().type == Exprent.EXPRENT_ARRAY) {
-              ArrayExprent arrex = (ArrayExprent)aas.getLeft();
-              if (arrex.getArray().type == Exprent.EXPRENT_VAR && arrvar.equals(arrex.getArray())
-                  && arrex.getIndex().type == Exprent.EXPRENT_CONST) {
+              ArrayExprent arrExpr = (ArrayExprent)aas.getLeft();
+              if (arrExpr.getArray().type == Exprent.EXPRENT_VAR &&
+                  arrVar.equals(arrExpr.getArray()) &&
+                  arrExpr.getIndex().type == Exprent.EXPRENT_CONST) {
+                int constValue = ((ConstExprent)arrExpr.getIndex()).getIntValue();
 
-                int constvalue = ((ConstExprent)arrex.getIndex()).getIntValue();
-
-                if (constvalue < newex.getLstArrayElements().size()) {
-                  Exprent init = newex.getLstArrayElements().get(constvalue);
+                if (constValue < newExpr.getLstArrayElements().size()) {
+                  Exprent init = newExpr.getLstArrayElements().get(constValue);
                   if (init.type == Exprent.EXPRENT_CONST) {
                     ConstExprent cinit = (ConstExprent)init;
+                    VarType arrType = newExpr.getNewType().decreaseArrayDim();
+                    ConstExprent defaultVal = ExprProcessor.getDefaultArrayValue(arrType);
 
-                    VarType arrtype = newex.getNewType().decreaseArrayDim();
+                    if (cinit.equals(defaultVal)) {
+                      Exprent tempExpr = aas.getRight();
 
-                    ConstExprent defaultval = ExprProcessor.getDefaultArrayValue(arrtype);
+                      if (!tempExpr.containsExprent(arrVar)) {
+                        newExpr.getLstArrayElements().set(constValue, tempExpr);
 
-                    if (cinit.equals(defaultval)) {
-
-                      Exprent tempexpr = aas.getRight();
-
-                      if (!tempexpr.containsExprent(arrvar)) {
-                        newex.getLstArrayElements().set(constvalue, tempexpr);
-
-                        if (tempexpr.type == Exprent.EXPRENT_NEW) {
-                          NewExprent tempnewex = (NewExprent)tempexpr;
-                          int dims = newex.getNewType().arrayDim;
-                          if (dims > 1 && !tempnewex.getLstArrayElements().isEmpty()) {
-                            tempnewex.setDirectArrayInit(true);
+                        if (tempExpr.type == Exprent.EXPRENT_NEW) {
+                          NewExprent tempNewExpr = (NewExprent)tempExpr;
+                          int dims = newExpr.getNewType().arrayDim;
+                          if (dims > 1 && !tempNewExpr.getLstArrayElements().isEmpty()) {
+                            tempNewExpr.setDirectArrayInit(true);
                           }
                         }
 
@@ -290,27 +251,24 @@ public class SimplifyExprentsHelper {
     return false;
   }
 
-
   private static int isArrayInitializer(List<Exprent> list, int index) {
-
     Exprent current = list.get(index);
     if (current.type == Exprent.EXPRENT_ASSIGNMENT) {
       AssignmentExprent as = (AssignmentExprent)current;
 
       if (as.getRight().type == Exprent.EXPRENT_NEW && as.getLeft().type == Exprent.EXPRENT_VAR) {
-        NewExprent newex = (NewExprent)as.getRight();
+        NewExprent newExpr = (NewExprent)as.getRight();
 
-        if (newex.getExprType().arrayDim > 0 && newex.getLstDims().size() == 1 && newex.getLstArrayElements().isEmpty() &&
-            newex.getLstDims().get(0).type == Exprent.EXPRENT_CONST) {
+        if (newExpr.getExprType().arrayDim > 0 && newExpr.getLstDims().size() == 1 && newExpr.getLstArrayElements().isEmpty() &&
+            newExpr.getLstDims().get(0).type == Exprent.EXPRENT_CONST) {
 
-          int size = ((Integer)((ConstExprent)newex.getLstDims().get(0)).getValue()).intValue();
+          int size = (Integer)((ConstExprent)newExpr.getLstDims().get(0)).getValue();
           if (size == 0) {
             return 0;
           }
 
-          VarExprent arrvar = (VarExprent)as.getLeft();
-
-          HashMap<Integer, Exprent> mapInit = new HashMap<Integer, Exprent>();
+          VarExprent arrVar = (VarExprent)as.getLeft();
+          Map<Integer, Exprent> mapInit = new HashMap<>();
 
           int i = 1;
           while (index + i < list.size() && i <= size) {
@@ -320,17 +278,14 @@ public class SimplifyExprentsHelper {
             if (expr.type == Exprent.EXPRENT_ASSIGNMENT) {
               AssignmentExprent aas = (AssignmentExprent)expr;
               if (aas.getLeft().type == Exprent.EXPRENT_ARRAY) {
-                ArrayExprent arrex = (ArrayExprent)aas.getLeft();
-                if (arrex.getArray().type == Exprent.EXPRENT_VAR && arrvar.equals(arrex.getArray())
-                    && arrex.getIndex().type == Exprent.EXPRENT_CONST) {
-
-                  int constvalue = ((ConstExprent)arrex.getIndex())
-                    .getIntValue(); // TODO: check for a number type. Failure extremely improbable, but nevertheless...
-
-                  if (constvalue < size && !mapInit.containsKey(constvalue)) {
-
-                    if (!aas.getRight().containsExprent(arrvar)) {
-                      mapInit.put(constvalue, aas.getRight());
+                ArrayExprent arrExpr = (ArrayExprent)aas.getLeft();
+                if (arrExpr.getArray().type == Exprent.EXPRENT_VAR && arrVar.equals(arrExpr.getArray()) &&
+                    arrExpr.getIndex().type == Exprent.EXPRENT_CONST) {
+                  // TODO: check for a number type. Failure extremely improbable, but nevertheless...
+                  int constValue = ((ConstExprent)arrExpr.getIndex()).getIntValue();
+                  if (constValue < size && !mapInit.containsKey(constValue)) {
+                    if (!aas.getRight().containsExprent(arrVar)) {
+                      mapInit.put(constValue, aas.getRight());
                       found = true;
                     }
                   }
@@ -347,33 +302,29 @@ public class SimplifyExprentsHelper {
 
           double fraction = ((double)mapInit.size()) / size;
 
-          if ((arrvar.isStack() && fraction > 0) || (size <= 7 && fraction >= 0.3) ||
-              (size > 7 && fraction >= 0.7)) {
-
-            List<Exprent> lstRet = new ArrayList<Exprent>();
-
-            VarType arrtype = newex.getNewType().decreaseArrayDim();
-
-            ConstExprent defaultval = ExprProcessor.getDefaultArrayValue(arrtype);
+          if ((arrVar.isStack() && fraction > 0) || (size <= 7 && fraction >= 0.3) || (size > 7 && fraction >= 0.7)) {
+            List<Exprent> lstRet = new ArrayList<>();
 
+            VarType arrayType = newExpr.getNewType().decreaseArrayDim();
+            ConstExprent defaultVal = ExprProcessor.getDefaultArrayValue(arrayType);
             for (int j = 0; j < size; j++) {
-              lstRet.add(defaultval.copy());
+              lstRet.add(defaultVal.copy());
             }
 
-            int dims = newex.getNewType().arrayDim;
+            int dims = newExpr.getNewType().arrayDim;
             for (Entry<Integer, Exprent> ent : mapInit.entrySet()) {
-              Exprent tempexpr = ent.getValue();
-              lstRet.set(ent.getKey(), tempexpr);
+              Exprent tempExpr = ent.getValue();
+              lstRet.set(ent.getKey(), tempExpr);
 
-              if (tempexpr.type == Exprent.EXPRENT_NEW) {
-                NewExprent tempnewex = (NewExprent)tempexpr;
-                if (dims > 1 && !tempnewex.getLstArrayElements().isEmpty()) {
-                  tempnewex.setDirectArrayInit(true);
+              if (tempExpr.type == Exprent.EXPRENT_NEW) {
+                NewExprent tempNewExpr = (NewExprent)tempExpr;
+                if (dims > 1 && !tempNewExpr.getLstArrayElements().isEmpty()) {
+                  tempNewExpr.setDirectArrayInit(true);
                 }
               }
             }
 
-            newex.setLstArrayElements(lstRet);
+            newExpr.setLstArrayElements(lstRet);
 
             return mapInit.size();
           }
@@ -385,26 +336,20 @@ public class SimplifyExprentsHelper {
   }
 
   private static boolean isTrivialStackAssignment(Exprent first) {
-
     if (first.type == Exprent.EXPRENT_ASSIGNMENT) {
       AssignmentExprent asf = (AssignmentExprent)first;
 
       if (asf.getLeft().type == Exprent.EXPRENT_VAR && asf.getRight().type == Exprent.EXPRENT_VAR) {
-        VarExprent varleft = (VarExprent)asf.getLeft();
-        VarExprent varright = (VarExprent)asf.getRight();
-
-        if (varleft.getIndex() == varright.getIndex() && varleft.isStack() &&
-            varright.isStack()) {
-          return true;
-        }
+        VarExprent left = (VarExprent)asf.getLeft();
+        VarExprent right = (VarExprent)asf.getRight();
+        return left.getIndex() == right.getIndex() && left.isStack() && right.isStack();
       }
     }
 
     return false;
   }
 
-  private static boolean isStackAssignement2(Exprent first, Exprent second) {  // e.g. 1.4-style class invocation
-
+  private static boolean isStackAssignment2(Exprent first, Exprent second) {  // e.g. 1.4-style class invocation
     if (first.type == Exprent.EXPRENT_ASSIGNMENT && second.type == Exprent.EXPRENT_ASSIGNMENT) {
       AssignmentExprent asf = (AssignmentExprent)first;
       AssignmentExprent ass = (AssignmentExprent)second;
@@ -421,8 +366,7 @@ public class SimplifyExprentsHelper {
     return false;
   }
 
-  private static boolean isStackAssignement(Exprent first, Exprent second) {
-
+  private static boolean isStackAssignment(Exprent first, Exprent second) {
     if (first.type == Exprent.EXPRENT_ASSIGNMENT && second.type == Exprent.EXPRENT_ASSIGNMENT) {
       AssignmentExprent asf = (AssignmentExprent)first;
       AssignmentExprent ass = (AssignmentExprent)second;
@@ -451,15 +395,13 @@ public class SimplifyExprentsHelper {
   }
 
   private static Exprent isPPIorMMI(Exprent first) {
-
     if (first.type == Exprent.EXPRENT_ASSIGNMENT) {
       AssignmentExprent as = (AssignmentExprent)first;
 
       if (as.getRight().type == Exprent.EXPRENT_FUNCTION) {
         FunctionExprent func = (FunctionExprent)as.getRight();
 
-        if (func.getFuncType() == FunctionExprent.FUNCTION_ADD ||
-            func.getFuncType() == FunctionExprent.FUNCTION_SUB) {
+        if (func.getFuncType() == FunctionExprent.FUNCTION_ADD || func.getFuncType() == FunctionExprent.FUNCTION_SUB) {
           Exprent econd = func.getLstOperands().get(0);
           Exprent econst = func.getLstOperands().get(1);
 
@@ -473,9 +415,8 @@ public class SimplifyExprentsHelper {
             Exprent left = as.getLeft();
 
             if (left.type != Exprent.EXPRENT_VAR && left.equals(econd)) {
-              FunctionExprent ret = new FunctionExprent(
-                func.getFuncType() == FunctionExprent.FUNCTION_ADD ? FunctionExprent.FUNCTION_PPI : FunctionExprent.FUNCTION_MMI,
-                econd, func.bytecode);
+              int type = func.getFuncType() == FunctionExprent.FUNCTION_ADD ? FunctionExprent.FUNCTION_PPI : FunctionExprent.FUNCTION_MMI;
+              FunctionExprent ret = new FunctionExprent(type, econd, func.bytecode);
               ret.setImplicitType(VarType.VARTYPE_INT);
               return ret;
             }
@@ -488,7 +429,6 @@ public class SimplifyExprentsHelper {
   }
 
   private static boolean isIPPorIMM(Exprent first, Exprent second) {
-
     if (first.type == Exprent.EXPRENT_ASSIGNMENT && second.type == Exprent.EXPRENT_FUNCTION) {
       AssignmentExprent as = (AssignmentExprent)first;
       FunctionExprent in = (FunctionExprent)second;
@@ -511,36 +451,77 @@ public class SimplifyExprentsHelper {
     return false;
   }
 
+  private static boolean isIPPorIMM2(Exprent first, Exprent second) {
+    if (first.type != Exprent.EXPRENT_ASSIGNMENT || second.type != Exprent.EXPRENT_ASSIGNMENT) {
+      return false;
+    }
+
+    AssignmentExprent af = (AssignmentExprent)first;
+    AssignmentExprent as = (AssignmentExprent)second;
+
+    if (as.getRight().type != Exprent.EXPRENT_FUNCTION) {
+      return false;
+    }
+
+    FunctionExprent func = (FunctionExprent)as.getRight();
+
+    if (func.getFuncType() != FunctionExprent.FUNCTION_ADD && func.getFuncType() != FunctionExprent.FUNCTION_SUB) {
+      return false;
+    }
+
+    Exprent econd = func.getLstOperands().get(0);
+    Exprent econst = func.getLstOperands().get(1);
+
+    if (econst.type != Exprent.EXPRENT_CONST && econd.type == Exprent.EXPRENT_CONST && func.getFuncType() == FunctionExprent.FUNCTION_ADD) {
+      econd = econst;
+      econst = func.getLstOperands().get(0);
+    }
+
+    if (econst.type == Exprent.EXPRENT_CONST &&
+        ((ConstExprent)econst).hasValueOne() &&
+        af.getLeft().equals(econd) &&
+        af.getRight().equals(as.getLeft()) &&
+        (af.getLeft().getExprentUse() & Exprent.MULTIPLE_USES) != 0) {
+      int type = func.getFuncType() == FunctionExprent.FUNCTION_ADD ? FunctionExprent.FUNCTION_IPP : FunctionExprent.FUNCTION_IMM;
+
+      FunctionExprent ret = new FunctionExprent(type, af.getRight(), func.bytecode);
+      ret.setImplicitType(VarType.VARTYPE_INT);
+
+      af.setRight(ret);
+      return true;
+    }
+
+    return false;
+  }
+  
   private static boolean isMonitorExit(Exprent first) {
     if (first.type == Exprent.EXPRENT_MONITOR) {
-      MonitorExprent monexpr = (MonitorExprent)first;
-      if (monexpr.getMonType() == MonitorExprent.MONITOR_EXIT && monexpr.getValue().type == Exprent.EXPRENT_VAR
-          && !((VarExprent)monexpr.getValue()).isStack()) {
-        return true;
-      }
+      MonitorExprent expr = (MonitorExprent)first;
+      return expr.getMonType() == MonitorExprent.MONITOR_EXIT &&
+             expr.getValue().type == Exprent.EXPRENT_VAR &&
+             !((VarExprent)expr.getValue()).isStack();
     }
 
     return false;
   }
 
   private static boolean isQualifiedNewGetClass(Exprent first, Exprent second) {
-
     if (first.type == Exprent.EXPRENT_INVOCATION) {
-      InvocationExprent invexpr = (InvocationExprent)first;
+      InvocationExprent invocation = (InvocationExprent)first;
 
-      if (!invexpr.isStatic() && invexpr.getInstance().type == Exprent.EXPRENT_VAR && invexpr.getName().equals("getClass") &&
-          invexpr.getStringDescriptor().equals("()Ljava/lang/Class;")) {
+      if (!invocation.isStatic() && invocation.getInstance().type == Exprent.EXPRENT_VAR && invocation.getName().equals("getClass") &&
+          invocation.getStringDescriptor().equals("()Ljava/lang/Class;")) {
 
         List<Exprent> lstExprents = second.getAllExprents();
         lstExprents.add(second);
 
         for (Exprent expr : lstExprents) {
           if (expr.type == Exprent.EXPRENT_NEW) {
-            NewExprent nexpr = (NewExprent)expr;
-            if (nexpr.getConstructor() != null && !nexpr.getConstructor().getLstParameters().isEmpty() &&
-                nexpr.getConstructor().getLstParameters().get(0).equals(invexpr.getInstance())) {
+            NewExprent newExpr = (NewExprent)expr;
+            if (newExpr.getConstructor() != null && !newExpr.getConstructor().getLstParameters().isEmpty() &&
+                newExpr.getConstructor().getLstParameters().get(0).equals(invocation.getInstance())) {
 
-              String classname = nexpr.getNewType().value;
+              String classname = newExpr.getNewType().value;
               ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(classname);
               if (node != null && node.type != ClassNode.CLASS_ROOT) {
                 return true;
@@ -554,118 +535,8 @@ public class SimplifyExprentsHelper {
     return false;
   }
 
-  //	private static boolean isConstructorInvocationRemote(List<Exprent> list, int index) {
-  //
-  //		Exprent current = list.get(index);
-  //
-  //		if(current.type == Exprent.EXPRENT_ASSIGNMENT) {
-  //			AssignmentExprent as = (AssignmentExprent)current;
-  //
-  //			if(as.getLeft().type == Exprent.EXPRENT_VAR && as.getRight().type == Exprent.EXPRENT_NEW) {
-  //
-  //				NewExprent newexpr = (NewExprent)as.getRight();
-  //				VarType newtype = newexpr.getNewType();
-  //				VarVersionPair leftPaar = new VarVersionPair((VarExprent)as.getLeft());
-  //
-  //				if(newtype.type == CodeConstants.TYPE_OBJECT && newtype.arrayDim == 0 &&
-  //						newexpr.getConstructor() == null) {
-  //
-  //					Set<VarVersionPair> setChangedVars = new HashSet<VarVersionPair>();
-  //
-  //					for(int i = index + 1; i < list.size(); i++) {
-  //						Exprent remote = list.get(i);
-  //
-  //						if(remote.type == Exprent.EXPRENT_INVOCATION) {
-  //							InvocationExprent in = (InvocationExprent)remote;
-  //
-  //							if(in.getFuncType() == InvocationExprent.TYP_INIT && in.getInstance().type == Exprent.EXPRENT_VAR
-  //									&& as.getLeft().equals(in.getInstance())) {
-  //
-  //								Set<VarVersionPair>  setVars = remote.getAllVariables();
-  //								setVars.remove(leftPaar);
-  //								setVars.retainAll(setChangedVars);
-  //
-  //								if(setVars.isEmpty()) {
-  //
-  //									newexpr.setConstructor(in);
-  //									in.setInstance(null);
-  //
-  //									if(!setChangedVars.isEmpty()) { // some exprents inbetween
-  //										list.add(index+1, as.copy());
-  //										list.remove(i+1);
-  //									} else {
-  //										list.set(i, as.copy());
-  //									}
-  //
-  //									return true;
-  //								}
-  //							}
-  //						}
-  //
-  //						boolean isTempAssignment = false;
-  //
-  //						if(remote.type == Exprent.EXPRENT_ASSIGNMENT) {    // ugly solution
-  //							AssignmentExprent asremote = (AssignmentExprent)remote;
-  //							if(asremote.getLeft().type == Exprent.EXPRENT_VAR &&
-  //									asremote.getRight().type == Exprent.EXPRENT_VAR) {
-  //								setChangedVars.add(new VarVersionPair((VarExprent)asremote.getLeft()));
-  //								isTempAssignment = true;
-  //							}
-  //
-  //							// FIXME: needs to be rewritten
-  //							// propagate (var = new X) forward to the <init> invokation and then reduce
-  //
-  ////							if(asremote.getLeft().type == Exprent.EXPRENT_VAR) {
-  ////								List<Exprent> lstRightExprents = asremote.getRight().getAllExprents(true);
-  ////								lstRightExprents.add(asremote.getRight());
-  ////
-  ////								Set<VarVersionPair> setTempChangedVars = new HashSet<VarVersionPair>();
-  ////								boolean isTemp = true;
-  ////
-  ////								for(Exprent expr : lstRightExprents) {
-  ////									if(expr.type != Exprent.EXPRENT_VAR && expr.type != Exprent.EXPRENT_FIELD) {
-  ////										isTemp = false;
-  ////										break;
-  ////									} else if(expr.type == Exprent.EXPRENT_VAR) {
-  ////										setTempChangedVars.add(new VarVersionPair((VarExprent)expr));
-  ////									}
-  ////								}
-  ////
-  ////								if(isTemp) {
-  ////									setChangedVars.addAll(setTempChangedVars);
-  ////									isTempAssignment = true;
-  ////								}
-  ////							}
-  ////						} else if(remote.type == Exprent.EXPRENT_FUNCTION) {
-  ////							FunctionExprent fexpr = (FunctionExprent)remote;
-  ////							if(fexpr.getFuncType() == FunctionExprent.FUNCTION_IPP || fexpr.getFuncType() == FunctionExprent.FUNCTION_IMM
-  ////									|| fexpr.getFuncType() == FunctionExprent.FUNCTION_PPI || fexpr.getFuncType() == FunctionExprent.FUNCTION_MMI) {
-  ////								if(fexpr.getLstOperands().get(0).type == Exprent.EXPRENT_VAR) {
-  ////									setChangedVars.add(new VarVersionPair((VarExprent)fexpr.getLstOperands().get(0)));
-  ////									isTempAssignment = true;
-  ////								}
-  ////							}
-  //						}
-  //
-  //						if(!isTempAssignment) {
-  //							Set<VarVersionPair> setVars = remote.getAllVariables();
-  //							if(setVars.contains(leftPaar)) {
-  //								return false;
-  //							} else {
-  //								setChangedVars.addAll(setVars);
-  //							}
-  //						}
-  //					}
-  //				}
-  //			}
-  //		}
-  //
-  //		return false;
-  //	}
-
-  // propagate (var = new X) forward to the <init> invokation
+  // propagate (var = new X) forward to the <init> invocation
   private static boolean isConstructorInvocationRemote(List<Exprent> list, int index) {
-
     Exprent current = list.get(index);
 
     if (current.type == Exprent.EXPRENT_ASSIGNMENT) {
@@ -673,12 +544,11 @@ public class SimplifyExprentsHelper {
 
       if (as.getLeft().type == Exprent.EXPRENT_VAR && as.getRight().type == Exprent.EXPRENT_NEW) {
 
-        NewExprent newexpr = (NewExprent)as.getRight();
-        VarType newtype = newexpr.getNewType();
-        VarVersionPair leftPaar = new VarVersionPair((VarExprent)as.getLeft());
-
-        if (newtype.type == CodeConstants.TYPE_OBJECT && newtype.arrayDim == 0 && newexpr.getConstructor() == null) {
+        NewExprent newExpr = (NewExprent)as.getRight();
+        VarType newType = newExpr.getNewType();
+        VarVersionPair leftPair = new VarVersionPair((VarExprent)as.getLeft());
 
+        if (newType.type == CodeConstants.TYPE_OBJECT && newType.arrayDim == 0 && newExpr.getConstructor() == null) {
           for (int i = index + 1; i < list.size(); i++) {
             Exprent remote = list.get(i);
 
@@ -689,8 +559,7 @@ public class SimplifyExprentsHelper {
               if (in.getFunctype() == InvocationExprent.TYP_INIT &&
                   in.getInstance().type == Exprent.EXPRENT_VAR &&
                   as.getLeft().equals(in.getInstance())) {
-
-                newexpr.setConstructor(in);
+                newExpr.setConstructor(in);
                 in.setInstance(null);
 
                 list.set(i, as.copy());
@@ -701,7 +570,7 @@ public class SimplifyExprentsHelper {
 
             // check for variable in use
             Set<VarVersionPair> setVars = remote.getAllVariables();
-            if (setVars.contains(leftPaar)) { // variable used somewhere in between -> exit, need a better reduced code
+            if (setVars.contains(leftPair)) { // variable used somewhere in between -> exit, need a better reduced code
               return false;
             }
           }
@@ -713,7 +582,6 @@ public class SimplifyExprentsHelper {
   }
 
   private static Exprent isLambda(Exprent exprent, StructClass cl) {
-
     List<Exprent> lst = exprent.getAllExprents();
     for (Exprent expr : lst) {
       Exprent ret = isLambda(expr, cl);
@@ -726,19 +594,17 @@ public class SimplifyExprentsHelper {
       InvocationExprent in = (InvocationExprent)exprent;
 
       if (in.getInvocationTyp() == InvocationExprent.INVOKE_DYNAMIC) {
-
         String lambda_class_name = cl.qualifiedName + in.getInvokeDynamicClassSuffix();
         ClassNode lambda_class = DecompilerContext.getClassProcessor().getMapRootClasses().get(lambda_class_name);
 
         if (lambda_class != null) { // real lambda class found, replace invocation with an anonymous class
-
-          NewExprent newexp = new NewExprent(new VarType(lambda_class_name, true), null, 0, in.bytecode);
-          newexp.setConstructor(in);
-          // note: we don't set the instance to null with in.setInstance(null) like it is done for a common constructor invokation
+          NewExprent newExpr = new NewExprent(new VarType(lambda_class_name, true), null, 0, in.bytecode);
+          newExpr.setConstructor(in);
+          // note: we don't set the instance to null with in.setInstance(null) like it is done for a common constructor invocation
           // lambda can also be a reference to a virtual method (e.g. String x; ...(x::toString);)
           // in this case instance will hold the corresponding object
 
-          return newexp;
+          return newExpr;
         }
       }
     }
@@ -746,9 +612,7 @@ public class SimplifyExprentsHelper {
     return null;
   }
 
-
   private static Exprent isSimpleConstructorInvocation(Exprent exprent) {
-
     List<Exprent> lst = exprent.getAllExprents();
     for (Exprent expr : lst) {
       Exprent ret = isSimpleConstructorInvocation(expr);
@@ -760,52 +624,47 @@ public class SimplifyExprentsHelper {
     if (exprent.type == Exprent.EXPRENT_INVOCATION) {
       InvocationExprent in = (InvocationExprent)exprent;
       if (in.getFunctype() == InvocationExprent.TYP_INIT && in.getInstance().type == Exprent.EXPRENT_NEW) {
-        NewExprent newexp = (NewExprent)in.getInstance();
-        newexp.setConstructor(in);
+        NewExprent newExpr = (NewExprent)in.getInstance();
+        newExpr.setConstructor(in);
         in.setInstance(null);
-        return newexp;
+        return newExpr;
       }
     }
 
     return null;
   }
 
-
   private static boolean buildIff(Statement stat, SSAConstructorSparseEx ssa) {
-
     if (stat.type == Statement.TYPE_IF && stat.getExprents() == null) {
-      IfStatement stif = (IfStatement)stat;
+      IfStatement statement = (IfStatement)stat;
+      Exprent ifHeadExpr = statement.getHeadexprent();
+      Set<Integer> ifHeadExprBytecode = (ifHeadExpr == null ? null : ifHeadExpr.bytecode);
 
-      Exprent ifheadexpr = stif.getHeadexprent();
-      Set<Integer> ifheadexpr_bytecode = (ifheadexpr == null ? null : ifheadexpr.bytecode);
+      if (statement.iftype == IfStatement.IFTYPE_IFELSE) {
+        Statement ifStatement = statement.getIfstat();
+        Statement elseStatement = statement.getElsestat();
 
-      if (stif.iftype == IfStatement.IFTYPE_IFELSE) {
-        Statement ifstat = stif.getIfstat();
-        Statement elsestat = stif.getElsestat();
+        if (ifStatement.getExprents() != null && ifStatement.getExprents().size() == 1 &&
+            elseStatement.getExprents() != null && elseStatement.getExprents().size() == 1 &&
+            ifStatement.getAllSuccessorEdges().size() == 1 && elseStatement.getAllSuccessorEdges().size() == 1 &&
+            ifStatement.getAllSuccessorEdges().get(0).getDestination() == elseStatement.getAllSuccessorEdges().get(0).getDestination()) {
+          Exprent ifExpr = ifStatement.getExprents().get(0);
+          Exprent elseExpr = elseStatement.getExprents().get(0);
 
-        if (ifstat.getExprents() != null && ifstat.getExprents().size() == 1
-            && elsestat.getExprents() != null && elsestat.getExprents().size() == 1
-            && ifstat.getAllSuccessorEdges().size() == 1 && elsestat.getAllSuccessorEdges().size() == 1
-            && ifstat.getAllSuccessorEdges().get(0).getDestination() == elsestat.getAllSuccessorEdges().get(0).getDestination()) {
+          if (ifExpr.type == Exprent.EXPRENT_ASSIGNMENT && elseExpr.type == Exprent.EXPRENT_ASSIGNMENT) {
+            AssignmentExprent ifAssign = (AssignmentExprent)ifExpr;
+            AssignmentExprent elseAssign = (AssignmentExprent)elseExpr;
 
-          Exprent ifexpr = ifstat.getExprents().get(0);
-          Exprent elseexpr = elsestat.getExprents().get(0);
-
-          if (ifexpr.type == Exprent.EXPRENT_ASSIGNMENT && elseexpr.type == Exprent.EXPRENT_ASSIGNMENT) {
-            AssignmentExprent ifas = (AssignmentExprent)ifexpr;
-            AssignmentExprent elseas = (AssignmentExprent)elseexpr;
-
-            if (ifas.getLeft().type == Exprent.EXPRENT_VAR && elseas.getLeft().type == Exprent.EXPRENT_VAR) {
-              VarExprent ifvar = (VarExprent)ifas.getLeft();
-              VarExprent elsevar = (VarExprent)elseas.getLeft();
-
-              if (ifvar.getIndex() == elsevar.getIndex() && ifvar.isStack()) { // ifvar.getIndex() >= VarExprent.STACK_BASE) {
+            if (ifAssign.getLeft().type == Exprent.EXPRENT_VAR && elseAssign.getLeft().type == Exprent.EXPRENT_VAR) {
+              VarExprent ifVar = (VarExprent)ifAssign.getLeft();
+              VarExprent elseVar = (VarExprent)elseAssign.getLeft();
 
+              if (ifVar.getIndex() == elseVar.getIndex() && ifVar.isStack()) { // ifVar.getIndex() >= VarExprent.STACK_BASE) {
                 boolean found = false;
 
                 for (Entry<VarVersionPair, FastSparseSet<Integer>> ent : ssa.getPhi().entrySet()) {
-                  if (ent.getKey().var == ifvar.getIndex()) {
-                    if (ent.getValue().contains(ifvar.getVersion()) && ent.getValue().contains(elsevar.getVersion())) {
+                  if (ent.getKey().var == ifVar.getIndex()) {
+                    if (ent.getValue().contains(ifVar.getVersion()) && ent.getValue().contains(elseVar.getVersion())) {
                       found = true;
                       break;
                     }
@@ -813,62 +672,61 @@ public class SimplifyExprentsHelper {
                 }
 
                 if (found) {
-                  List<Exprent> data = new ArrayList<Exprent>();
-                  data.addAll(stif.getFirst().getExprents());
+                  List<Exprent> data = new ArrayList<>(statement.getFirst().getExprents());
 
-                  data.add(new AssignmentExprent(ifvar, new FunctionExprent(FunctionExprent.FUNCTION_IIF,
-                                                                            Arrays.asList(
-                                                                              stif.getHeadexprent().getCondition(),
-                                                                              ifas.getRight(),
-                                                                              elseas.getRight()), ifheadexpr_bytecode), ifheadexpr_bytecode));
-                  stif.setExprents(data);
+                  List<Exprent> operands = Arrays.asList(statement.getHeadexprent().getCondition(), ifAssign.getRight(), elseAssign.getRight());
+                  data.add(new AssignmentExprent(ifVar, new FunctionExprent(FunctionExprent.FUNCTION_IIF, operands, ifHeadExprBytecode), ifHeadExprBytecode));
+                  statement.setExprents(data);
 
-                  if (stif.getAllSuccessorEdges().isEmpty()) {
-                    StatEdge ifedge = ifstat.getAllSuccessorEdges().get(0);
-                    StatEdge edge = new StatEdge(ifedge.getType(), stif, ifedge.getDestination());
+                  if (statement.getAllSuccessorEdges().isEmpty()) {
+                    StatEdge ifEdge = ifStatement.getAllSuccessorEdges().get(0);
+                    StatEdge edge = new StatEdge(ifEdge.getType(), statement, ifEdge.getDestination());
 
-                    stif.addSuccessor(edge);
-                    if (ifedge.closure != null) {
-                      ifedge.closure.addLabeledEdge(edge);
+                    statement.addSuccessor(edge);
+                    if (ifEdge.closure != null) {
+                      ifEdge.closure.addLabeledEdge(edge);
                     }
                   }
 
-                  SequenceHelper.destroyAndFlattenStatement(stif);
+                  SequenceHelper.destroyAndFlattenStatement(statement);
 
                   return true;
                 }
               }
             }
           }
-          else if (ifexpr.type == Exprent.EXPRENT_EXIT && elseexpr.type == Exprent.EXPRENT_EXIT) {
-            ExitExprent ifex = (ExitExprent)ifexpr;
-            ExitExprent elseex = (ExitExprent)elseexpr;
-
-            if (ifex.getExitType() == elseex.getExitType() && ifex.getValue() != null && elseex.getValue() != null &&
-                ifex.getExitType() == ExitExprent.EXIT_RETURN) {
+          else if (ifExpr.type == Exprent.EXPRENT_EXIT && elseExpr.type == Exprent.EXPRENT_EXIT) {
+            ExitExprent ifExit = (ExitExprent)ifExpr;
+            ExitExprent elseExit = (ExitExprent)elseExpr;
 
+            if (ifExit.getExitType() == elseExit.getExitType() && ifExit.getValue() != null && elseExit.getValue() != null &&
+                ifExit.getExitType() == ExitExprent.EXIT_RETURN) {
               // throw is dangerous, because of implicit casting to a common superclass
               // e.g. throws IOException and throw true?new RuntimeException():new IOException(); won't work
-              if (ifex.getExitType() == ExitExprent.EXIT_THROW &&
-                  !ifex.getValue().getExprType().equals(elseex.getValue().getExprType())) {  // note: getExprType unreliable at this point!
+              if (ifExit.getExitType() == ExitExprent.EXIT_THROW &&
+                  !ifExit.getValue().getExprType().equals(elseExit.getValue().getExprType())) {  // note: getExprType unreliable at this point!
                 return false;
               }
 
-              List<Exprent> data = new ArrayList<Exprent>();
-              data.addAll(stif.getFirst().getExprents());
+              // avoid flattening to 'iff' if any of the branches is an 'iff' already
+              if (isIff(ifExit.getValue()) || isIff(elseExit.getValue())) {
+                return false;
+              }
 
-              data.add(new ExitExprent(ifex.getExitType(), new FunctionExprent(FunctionExprent.FUNCTION_IIF,
+              List<Exprent> data = new ArrayList<>(statement.getFirst().getExprents());
+
+              data.add(new ExitExprent(ifExit.getExitType(), new FunctionExprent(FunctionExprent.FUNCTION_IIF,
                                                                                Arrays.asList(
-                                                                                 stif.getHeadexprent().getCondition(),
-                                                                                 ifex.getValue(),
-                                                                                 elseex.getValue()), ifheadexpr_bytecode), ifex.getRetType(), ifheadexpr_bytecode));
-              stif.setExprents(data);
+                                                                                 statement.getHeadexprent().getCondition(),
+                                                                                 ifExit.getValue(),
+                                                                                 elseExit.getValue()), ifHeadExprBytecode), ifExit.getRetType(), ifHeadExprBytecode));
+              statement.setExprents(data);
 
-              StatEdge retedge = ifstat.getAllSuccessorEdges().get(0);
-              stif.addSuccessor(new StatEdge(StatEdge.TYPE_BREAK, stif, retedge.getDestination(),
-                                             retedge.closure == stif ? stif.getParent() : retedge.closure));
+              StatEdge retEdge = ifStatement.getAllSuccessorEdges().get(0);
+              Statement closure = retEdge.closure == statement ? statement.getParent() : retEdge.closure;
+              statement.addSuccessor(new StatEdge(StatEdge.TYPE_BREAK, statement, retEdge.getDestination(), closure));
 
-              SequenceHelper.destroyAndFlattenStatement(stif);
+              SequenceHelper.destroyAndFlattenStatement(statement);
 
               return true;
             }
@@ -880,59 +738,31 @@ public class SimplifyExprentsHelper {
     return false;
   }
 
-  static {
-    class14Builder.parse(
-          "statement type:if iftype:if exprsize:-1\n" +
-          " exprent position:head type:if\n" +
-          "  exprent type:function functype:eq\n" +
-          "   exprent type:field name:$fieldname$\n" +
-          "   exprent type:constant consttype:null\n" +
-          " statement type:basicblock\n" +
-          "  exprent position:-1 type:assignment ret:$assignfield$\n" +
-          "   exprent type:var index:$var$\n" +
-          "   exprent type:field name:$fieldname$\n" +
-          " statement type:sequence statsize:2\n" +
-          "  statement type:trycatch\n" +  
-          "   statement type:basicblock exprsize:1\n" +
-          "    exprent type:assignment\n" +
-          "     exprent type:var index:$var$\n" +
-          "     exprent type:invocation invclass:java/lang/Class signature:forName(Ljava/lang/String;)Ljava/lang/Class;\n" +
-          "      exprent position:0 type:constant consttype:string constvalue:$classname$\n" +
-          "   statement type:basicblock exprsize:1\n" +
-          "    exprent type:exit exittype:throw\n" + 
-          "  statement type:basicblock exprsize:1\n" + 
-          "   exprent type:assignment\n" + 
-          "    exprent type:field name:$fieldname$ ret:$field$\n" +
-          "    exprent type:var index:$var$"
-        );
+  private static boolean isIff(Exprent exp) {
+    return exp.type == Exprent.EXPRENT_FUNCTION && ((FunctionExprent) exp).getFuncType() == FunctionExprent.FUNCTION_IIF;
   }
-  
+
   private static boolean collapseInlinedClass14(Statement stat) {
-
     boolean ret = class14Builder.match(stat);
-    if(ret) {
-      
+    if (ret) {
       String class_name = (String)class14Builder.getVariableValue("$classname$");
-      AssignmentExprent assfirst = (AssignmentExprent)class14Builder.getVariableValue("$assignfield$");
-      FieldExprent fieldexpr = (FieldExprent)class14Builder.getVariableValue("$field$");
+      AssignmentExprent assignment = (AssignmentExprent)class14Builder.getVariableValue("$assignfield$");
+      FieldExprent fieldExpr = (FieldExprent)class14Builder.getVariableValue("$field$");
 
-      assfirst.replaceExprent(assfirst.getRight(), new ConstExprent(VarType.VARTYPE_CLASS, class_name, null));
-      
-      List<Exprent> data = new ArrayList<Exprent>();
-      data.addAll(stat.getFirst().getExprents());
+      assignment.replaceExprent(assignment.getRight(), new ConstExprent(VarType.VARTYPE_CLASS, class_name, null));
+
+      List<Exprent> data = new ArrayList<>(stat.getFirst().getExprents());
 
       stat.setExprents(data);
 
       SequenceHelper.destroyAndFlattenStatement(stat);
-      
+
       ClassWrapper wrapper = (ClassWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_WRAPPER);
       if (wrapper != null) {
-        wrapper.getHiddenMembers().add(InterpreterUtil.makeUniqueKey(fieldexpr.getName(), fieldexpr.getDescriptor().descriptorString));
+        wrapper.getHiddenMembers().add(InterpreterUtil.makeUniqueKey(fieldExpr.getName(), fieldExpr.getDescriptor().descriptorString));
       }
-      
     }
-    
+
     return ret;
   }
-  
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
index 62d3465..1232e64 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -34,36 +20,22 @@ import org.jetbrains.java.decompiler.util.SFormsFastMapDirect;
 import java.util.*;
 import java.util.Map.Entry;
 
-
 public class StackVarsProcessor {
-
   public void simplifyStackVars(RootStatement root, StructMethod mt, StructClass cl) {
-
-    HashSet<Integer> setReorderedIfs = new HashSet<Integer>();
-
+    Set<Integer> setReorderedIfs = new HashSet<>();
     SSAUConstructorSparseEx ssau = null;
 
     while (true) {
-
       boolean found = false;
 
-      //			System.out.println("--------------- \r\n"+root.toJava());
-
       SSAConstructorSparseEx ssa = new SSAConstructorSparseEx();
       ssa.splitVariables(root, mt);
 
-      //			System.out.println("--------------- \r\n"+root.toJava());
-
-
       SimplifyExprentsHelper sehelper = new SimplifyExprentsHelper(ssau == null);
       while (sehelper.simplifyStackVarsStatement(root, setReorderedIfs, ssa, cl)) {
-        //				System.out.println("--------------- \r\n"+root.toJava());
         found = true;
       }
 
-
-      //			System.out.println("=============== \r\n"+root.toJava());
-
       setVersionsToNull(root);
 
       SequenceHelper.condenseSequences(root);
@@ -71,21 +43,10 @@ public class StackVarsProcessor {
       ssau = new SSAUConstructorSparseEx();
       ssau.splitVariables(root, mt);
 
-      //			try {
-      //				DotExporter.toDotFile(ssau.getSsuversions(), new File("c:\\Temp\\gr12_my.dot"));
-      //			} catch(Exception ex) {
-      //				ex.printStackTrace();
-      //			}
-
-      //			System.out.println("++++++++++++++++ \r\n"+root.toJava());
-
-
       if (iterateStatements(root, ssau)) {
         found = true;
       }
 
-      //			System.out.println("***************** \r\n"+root.toJava());
-
       setVersionsToNull(root);
 
       if (!found) {
@@ -97,21 +58,12 @@ public class StackVarsProcessor {
     ssau = new SSAUConstructorSparseEx();
     ssau.splitVariables(root, mt);
 
-    //		try {
-    //			DotExporter.toDotFile(ssau.getSsuversions(), new File("c:\\Temp\\gr12_my.dot"));
-    //		} catch(Exception ex) {
-    //			ex.printStackTrace();
-    //		}
-
     iterateStatements(root, ssau);
 
-    //		System.out.println("~~~~~~~~~~~~~~~~~~~~~~ \r\n"+root.toJava());
-
     setVersionsToNull(root);
   }
 
   private static void setVersionsToNull(Statement stat) {
-
     if (stat.getExprents() == null) {
       for (Object obj : stat.getSequentialObjects()) {
         if (obj instanceof Statement) {
@@ -130,7 +82,6 @@ public class StackVarsProcessor {
   }
 
   private static void setExprentVersionsToNull(Exprent exprent) {
-
     List<Exprent> lst = exprent.getAllExprents(true);
     lst.add(exprent);
 
@@ -141,32 +92,29 @@ public class StackVarsProcessor {
     }
   }
 
-
   private boolean iterateStatements(RootStatement root, SSAUConstructorSparseEx ssa) {
-
     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
     DirectGraph dgraph = flatthelper.buildDirectGraph(root);
 
     boolean res = false;
 
-    HashSet<DirectNode> setVisited = new HashSet<DirectNode>();
-    LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
-    LinkedList<HashMap<VarVersionPair, Exprent>> stackMaps = new LinkedList<HashMap<VarVersionPair, Exprent>>();
+    Set<DirectNode> setVisited = new HashSet<>();
+    LinkedList<DirectNode> stack = new LinkedList<>();
+    LinkedList<Map<VarVersionPair, Exprent>> stackMaps = new LinkedList<>();
 
     stack.add(dgraph.first);
-    stackMaps.add(new HashMap<VarVersionPair, Exprent>());
+    stackMaps.add(new HashMap<>());
 
     while (!stack.isEmpty()) {
-
       DirectNode nd = stack.removeFirst();
-      HashMap<VarVersionPair, Exprent> mapVarValues = stackMaps.removeFirst();
+      Map<VarVersionPair, Exprent> mapVarValues = stackMaps.removeFirst();
 
       if (setVisited.contains(nd)) {
         continue;
       }
       setVisited.add(nd);
 
-      List<List<Exprent>> lstLists = new ArrayList<List<Exprent>>();
+      List<List<Exprent>> lstLists = new ArrayList<>();
 
       if (!nd.exprents.isEmpty()) {
         lstLists.add(nd.exprents);
@@ -196,9 +144,6 @@ public class StackVarsProcessor {
           }
 
           int[] ret = iterateExprent(lst, index, next, mapVarValues, ssa);
-
-          //System.out.println("***************** \r\n"+root.toJava());
-
           if (ret[0] >= 0) {
             index = ret[0];
           }
@@ -211,7 +156,7 @@ public class StackVarsProcessor {
 
       for (DirectNode ndx : nd.succs) {
         stack.add(ndx);
-        stackMaps.add(new HashMap<VarVersionPair, Exprent>(mapVarValues));
+        stackMaps.add(new HashMap<>(mapVarValues));
       }
 
       // make sure the 3 special exprent lists in a loop (init, condition, increment) are not empty
@@ -235,26 +180,21 @@ public class StackVarsProcessor {
     return res;
   }
 
-
-  private static Exprent isReplaceableVar(Exprent exprent, HashMap<VarVersionPair, Exprent> mapVarValues, SSAUConstructorSparseEx ssau) {
-
+  private static Exprent isReplaceableVar(Exprent exprent, Map<VarVersionPair, Exprent> mapVarValues) {
     Exprent dest = null;
-
     if (exprent.type == Exprent.EXPRENT_VAR) {
       VarExprent var = (VarExprent)exprent;
       dest = mapVarValues.get(new VarVersionPair(var));
     }
-
     return dest;
   }
 
   private static void replaceSingleVar(Exprent parent, VarExprent var, Exprent dest, SSAUConstructorSparseEx ssau) {
-
     parent.replaceExprent(var, dest);
 
     // live sets
     SFormsFastMapDirect livemap = ssau.getLiveVarVersionsMap(new VarVersionPair(var));
-    HashSet<VarVersionPair> setVars = getAllVersions(dest);
+    Set<VarVersionPair> setVars = getAllVersions(dest);
 
     for (VarVersionPair varpaar : setVars) {
       VarVersionNode node = ssau.getSsuversions().nodes.getWithKey(varpaar);
@@ -279,9 +219,11 @@ public class StackVarsProcessor {
     }
   }
 
-  private int[] iterateExprent(List<Exprent> lstExprents, int index, Exprent next, HashMap<VarVersionPair,
-    Exprent> mapVarValues, SSAUConstructorSparseEx ssau) {
-
+  private int[] iterateExprent(List<Exprent> lstExprents,
+                               int index,
+                               Exprent next,
+                               Map<VarVersionPair, Exprent> mapVarValues,
+                               SSAUConstructorSparseEx ssau) {
     Exprent exprent = lstExprents.get(index);
 
     int changed = 0;
@@ -329,7 +271,7 @@ public class StackVarsProcessor {
 
     VarVersionPair leftpaar = new VarVersionPair(left);
 
-    List<VarVersionNode> usedVers = new ArrayList<VarVersionNode>();
+    List<VarVersionNode> usedVers = new ArrayList<>();
     boolean notdom = getUsedVersions(ssau, leftpaar, usedVers);
 
     if (!notdom && usedVers.isEmpty()) {
@@ -368,14 +310,14 @@ public class StackVarsProcessor {
       return new int[]{-1, changed};
     }
 
-    HashMap<Integer, HashSet<VarVersionPair>> mapVars = getAllVarVersions(leftpaar, right, ssau);
+    Map<Integer, Set<VarVersionPair>> mapVars = getAllVarVersions(leftpaar, right, ssau);
 
     boolean isSelfReference = mapVars.containsKey(leftpaar.var);
     if (isSelfReference && notdom) {
       return new int[]{-1, changed};
     }
 
-    HashSet<VarVersionPair> setNextVars = next == null ? null : getAllVersions(next);
+    Set<VarVersionPair> setNextVars = next == null ? null : getAllVersions(next);
 
     // FIXME: fix the entire method!
     if (right.type != Exprent.EXPRENT_CONST &&
@@ -394,8 +336,7 @@ public class StackVarsProcessor {
     boolean vernotreplaced = false;
     boolean verreplaced = false;
 
-
-    HashSet<VarVersionPair> setTempUsedVers = new HashSet<VarVersionPair>();
+    Set<VarVersionPair> setTempUsedVers = new HashSet<>();
 
     for (VarVersionNode usedvar : usedVers) {
       VarVersionPair usedver = new VarVersionPair(usedvar.var, usedvar.version);
@@ -438,11 +379,10 @@ public class StackVarsProcessor {
     }
   }
 
-  private static HashSet<VarVersionPair> getAllVersions(Exprent exprent) {
+  private static Set<VarVersionPair> getAllVersions(Exprent exprent) {
+    Set<VarVersionPair> res = new HashSet<>();
 
-    HashSet<VarVersionPair> res = new HashSet<VarVersionPair>();
-
-    List<Exprent> listTemp = new ArrayList<Exprent>(exprent.getAllExprents(true));
+    List<Exprent> listTemp = new ArrayList<>(exprent.getAllExprents(true));
     listTemp.add(exprent);
 
     for (Exprent expr : listTemp) {
@@ -458,9 +398,8 @@ public class StackVarsProcessor {
   private static Object[] iterateChildExprent(Exprent exprent,
                                               Exprent parent,
                                               Exprent next,
-                                              HashMap<VarVersionPair, Exprent> mapVarValues,
+                                              Map<VarVersionPair, Exprent> mapVarValues,
                                               SSAUConstructorSparseEx ssau) {
-
     boolean changed = false;
 
     for (Exprent expr : exprent.getAllExprents()) {
@@ -487,7 +426,7 @@ public class StackVarsProcessor {
       }
     }
 
-    Exprent dest = isReplaceableVar(exprent, mapVarValues, ssau);
+    Exprent dest = isReplaceableVar(exprent, mapVarValues);
     if (dest != null) {
       return new Object[]{dest, true, true};
     }
@@ -523,7 +462,7 @@ public class StackVarsProcessor {
 
     VarVersionPair leftpaar = new VarVersionPair(left);
 
-    List<VarVersionNode> usedVers = new ArrayList<VarVersionNode>();
+    List<VarVersionNode> usedVers = new ArrayList<>();
     boolean notdom = getUsedVersions(ssau, leftpaar, usedVers);
 
     if (!notdom && usedVers.isEmpty()) {
@@ -541,23 +480,21 @@ public class StackVarsProcessor {
       return new Object[]{null, changed, false};
     }
 
-    HashMap<Integer, HashSet<VarVersionPair>> mapVars = getAllVarVersions(leftpaar, right, ssau);
-
+    Map<Integer, Set<VarVersionPair>> mapVars = getAllVarVersions(leftpaar, right, ssau);
     if (mapVars.containsKey(leftpaar.var) && notdom) {
       return new Object[]{null, changed, false};
     }
 
-
     mapVars.remove(leftpaar.var);
 
-    HashSet<VarVersionPair> setAllowedVars = getAllVersions(parent);
+    Set<VarVersionPair> setAllowedVars = getAllVersions(parent);
     if (next != null) {
       setAllowedVars.addAll(getAllVersions(next));
     }
 
     boolean vernotreplaced = false;
 
-    HashSet<VarVersionPair> setTempUsedVers = new HashSet<VarVersionPair>();
+    Set<VarVersionPair> setTempUsedVers = new HashSet<>();
 
     for (VarVersionNode usedvar : usedVers) {
       VarVersionPair usedver = new VarVersionPair(usedvar.var, usedvar.version);
@@ -572,7 +509,6 @@ public class StackVarsProcessor {
     }
 
     if (!notdom && !vernotreplaced) {
-
       for (VarVersionPair usedver : setTempUsedVers) {
         Exprent copy = right.copy();
         if (right.type == Exprent.EXPRENT_FIELD && ssau.getMapFieldVars().containsKey(right.id)) {
@@ -589,20 +525,17 @@ public class StackVarsProcessor {
     return new Object[]{null, changed, false};
   }
 
-  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<VarVersionNode> res) {
-
+  private static boolean getUsedVersions(SSAUConstructorSparseEx ssa, VarVersionPair var, List<? super VarVersionNode> res) {
     VarVersionsGraph ssuversions = ssa.getSsuversions();
     VarVersionNode varnode = ssuversions.nodes.getWithKey(var);
 
-    HashSet<VarVersionNode> setVisited = new HashSet<VarVersionNode>();
+    Set<VarVersionNode> setVisited = new HashSet<>();
+    Set<VarVersionNode> setNotDoms = new HashSet<>();
 
-    HashSet<VarVersionNode> setNotDoms = new HashSet<VarVersionNode>();
-
-    LinkedList<VarVersionNode> stack = new LinkedList<VarVersionNode>();
+    LinkedList<VarVersionNode> stack = new LinkedList<>();
     stack.add(varnode);
 
     while (!stack.isEmpty()) {
-
       VarVersionNode nd = stack.remove(0);
       setVisited.add(nd);
 
@@ -639,10 +572,9 @@ public class StackVarsProcessor {
   }
 
   private static boolean isVersionToBeReplaced(VarVersionPair usedvar,
-                                               HashMap<Integer, HashSet<VarVersionPair>> mapVars,
+                                               Map<Integer, Set<VarVersionPair>> mapVars,
                                                SSAUConstructorSparseEx ssau,
                                                VarVersionPair leftpaar) {
-
     VarVersionsGraph ssuversions = ssau.getSsuversions();
 
     SFormsFastMapDirect mapLiveVars = ssau.getLiveVarVersionsMap(usedvar);
@@ -657,13 +589,13 @@ public class StackVarsProcessor {
       return false;
     }
 
-    for (Entry<Integer, HashSet<VarVersionPair>> ent : mapVars.entrySet()) {
+    for (Entry<Integer, Set<VarVersionPair>> ent : mapVars.entrySet()) {
       FastSparseSet<Integer> liveverset = mapLiveVars.get(ent.getKey());
       if (liveverset == null) {
         return false;
       }
 
-      HashSet<VarVersionNode> domset = new HashSet<VarVersionNode>();
+      Set<VarVersionNode> domset = new HashSet<>();
       for (VarVersionPair verpaar : ent.getValue()) {
         domset.add(ssuversions.nodes.getWithKey(verpaar));
       }
@@ -687,11 +619,10 @@ public class StackVarsProcessor {
     return true;
   }
 
-  private static HashMap<Integer, HashSet<VarVersionPair>> getAllVarVersions(VarVersionPair leftvar,
-                                                                             Exprent exprent,
-                                                                             SSAUConstructorSparseEx ssau) {
-
-    HashMap<Integer, HashSet<VarVersionPair>> map = new HashMap<Integer, HashSet<VarVersionPair>>();
+  private static Map<Integer, Set<VarVersionPair>> getAllVarVersions(VarVersionPair leftvar,
+                                                                     Exprent exprent,
+                                                                     SSAUConstructorSparseEx ssau) {
+    Map<Integer, Set<VarVersionPair>> map = new HashMap<>();
     SFormsFastMapDirect mapLiveVars = ssau.getLiveVarVersionsMap(leftvar);
 
     List<Exprent> lst = exprent.getAllExprents(true);
@@ -702,7 +633,7 @@ public class StackVarsProcessor {
         int varindex = ((VarExprent)expr).getIndex();
         if (leftvar.var != varindex) {
           if (mapLiveVars.containsKey(varindex)) {
-            HashSet<VarVersionPair> verset = new HashSet<VarVersionPair>();
+            Set<VarVersionPair> verset = new HashSet<>();
             for (Integer vers : mapLiveVars.get(varindex)) {
               verset.add(new VarVersionPair(varindex, vers.intValue()));
             }
@@ -720,7 +651,7 @@ public class StackVarsProcessor {
         if (ssau.getMapFieldVars().containsKey(expr.id)) {
           int varindex = ssau.getMapFieldVars().get(expr.id);
           if (mapLiveVars.containsKey(varindex)) {
-            HashSet<VarVersionPair> verset = new HashSet<VarVersionPair>();
+            Set<VarVersionPair> verset = new HashSet<>();
             for (Integer vers : mapLiveVars.get(varindex)) {
               verset.add(new VarVersionPair(varindex, vers.intValue()));
             }
@@ -732,4 +663,4 @@ public class StackVarsProcessor {
 
     return map;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
index 26d427b..c481c0a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
@@ -21,9 +7,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class StatEdge {
-
-  public static final int TYPE_ALL = 0xFF;
-
   public static final int TYPE_REGULAR = 1;
   public static final int TYPE_EXCEPTION = 2;
   public static final int TYPE_BREAK = 4;
@@ -66,7 +49,7 @@ public class StatEdge {
   public StatEdge(Statement source, Statement destination, List<String> exceptions) {
     this(TYPE_EXCEPTION, source, destination);
     if (exceptions != null) {
-      this.exceptions = new ArrayList<String>(exceptions);
+      this.exceptions = new ArrayList<>(exceptions);
     }
   }
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java
index 23f778d..4e81646 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java
@@ -1,99 +1,24 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler;
 
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
 import org.jetbrains.java.decompiler.util.ListStack;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-
-//  --------------------------------------------------------------------
-//    Algorithm
-//  -------------------------------------------------------------------- 
-//  DFS(G)
-//  {
-//  make a new vertex x with edges x->v for all v
-//  initialize a counter N to zero
-//  initialize list L to empty
-//  build directed tree T, initially a single vertex {x}
-//  visit(x)
-//  }
-//
-//  visit(p)
-//  {
-//  add p to L
-//  dfsnum(p) = N
-//  increment N
-//  low(p) = dfsnum(p)
-//  for each edge p->q
-//      if q is not already in T
-//      {
-//      add p->q to T
-//      visit(q)
-//      low(p) = min(low(p), low(q))
-//      } else low(p) = min(low(p), dfsnum(q))
-//
-//  if low(p)=dfsnum(p)
-//  {
-//      output "component:"
-//      repeat
-//      remove last element v from L
-//      output v
-//      remove v from G
-//      until v=p
-//  }
-//  }	
-//  -------------------------------------------------------------------- 
+import java.util.*;
 
 public class StrongConnectivityHelper {
+  private final List<List<Statement>> components;
+  private final Set<Statement> setProcessed;
 
   private ListStack<Statement> lstack;
-
   private int ncounter;
-
-  private HashSet<Statement> tset;
-  private HashMap<Statement, Integer> dfsnummap;
-  private HashMap<Statement, Integer> lowmap;
-
-  private List<List<Statement>> components;
-
-  private HashSet<Statement> setProcessed;
-
-  // *****************************************************************************
-  // constructors
-  // *****************************************************************************
-
-  public StrongConnectivityHelper() {
-  }
+  private Set<Statement> tset;
+  private Map<Statement, Integer> dfsnummap;
+  private Map<Statement, Integer> lowmap;
 
   public StrongConnectivityHelper(Statement stat) {
-    findComponents(stat);
-  }
-
-  // *****************************************************************************
-  // public methods
-  // *****************************************************************************
-
-  public List<List<Statement>> findComponents(Statement stat) {
-
-    components = new ArrayList<List<Statement>>();
-    setProcessed = new HashSet<Statement>();
+    components = new ArrayList<>();
+    setProcessed = new HashSet<>();
 
     visitTree(stat.getFirst());
 
@@ -109,44 +34,14 @@ public class StrongConnectivityHelper {
         visitTree(st);
       }
     }
-
-    return components;
   }
 
-  public static boolean isExitComponent(List<Statement> lst) {
-
-    HashSet<Statement> set = new HashSet<Statement>();
-    for (Statement stat : lst) {
-      set.addAll(stat.getNeighbours(StatEdge.TYPE_REGULAR, Statement.DIRECTION_FORWARD));
-    }
-    set.removeAll(lst);
-
-    return (set.size() == 0);
-  }
-
-  public static List<Statement> getExitReps(List<List<Statement>> lst) {
-
-    List<Statement> res = new ArrayList<Statement>();
-
-    for (List<Statement> comp : lst) {
-      if (isExitComponent(comp)) {
-        res.add(comp.get(0));
-      }
-    }
-
-    return res;
-  }
-
-  // *****************************************************************************
-  // private methods
-  // *****************************************************************************
-
   private void visitTree(Statement stat) {
-    lstack = new ListStack<Statement>();
+    lstack = new ListStack<>();
     ncounter = 0;
-    tset = new HashSet<Statement>();
-    dfsnummap = new HashMap<Statement, Integer>();
-    lowmap = new HashMap<Statement, Integer>();
+    tset = new HashSet<>();
+    dfsnummap = new HashMap<>();
+    lowmap = new HashMap<>();
 
     visit(stat);
 
@@ -155,7 +50,6 @@ public class StrongConnectivityHelper {
   }
 
   private void visit(Statement stat) {
-
     lstack.push(stat);
     dfsnummap.put(stat, ncounter);
     lowmap.put(stat, ncounter);
@@ -164,8 +58,7 @@ public class StrongConnectivityHelper {
     List<Statement> lstSuccs = stat.getNeighbours(StatEdge.TYPE_REGULAR, Statement.DIRECTION_FORWARD); // TODO: set?
     lstSuccs.removeAll(setProcessed);
 
-    for (int i = 0; i < lstSuccs.size(); i++) {
-      Statement succ = lstSuccs.get(i);
+    for (Statement succ : lstSuccs) {
       int secvalue;
 
       if (tset.contains(succ)) {
@@ -181,7 +74,7 @@ public class StrongConnectivityHelper {
 
 
     if (lowmap.get(stat).intValue() == dfsnummap.get(stat).intValue()) {
-      List<Statement> lst = new ArrayList<Statement>();
+      List<Statement> lst = new ArrayList<>();
       Statement v;
       do {
         v = lstack.pop();
@@ -192,16 +85,29 @@ public class StrongConnectivityHelper {
     }
   }
 
+  public static boolean isExitComponent(List<? extends Statement> lst) {
+    Set<Statement> set = new HashSet<>();
+    for (Statement stat : lst) {
+      set.addAll(stat.getNeighbours(StatEdge.TYPE_REGULAR, Statement.DIRECTION_FORWARD));
+    }
+    set.removeAll(lst);
 
-  // *****************************************************************************
-  // getter and setter methods
-  // *****************************************************************************
+    return (set.size() == 0);
+  }
+
+  public static List<Statement> getExitReps(List<? extends List<Statement>> lst) {
+    List<Statement> res = new ArrayList<>();
+
+    for (List<Statement> comp : lst) {
+      if (isExitComponent(comp)) {
+        res.add(comp.get(0));
+      }
+    }
+
+    return res;
+  }
 
   public List<List<Statement>> getComponents() {
     return components;
   }
-
-  public void setComponents(List<List<Statement>> components) {
-    this.components = components;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
new file mode 100644
index 0000000..b49bf39
--- /dev/null
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/SwitchHelper.java
@@ -0,0 +1,80 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.java.decompiler.modules.decompiler;
+
+import org.jetbrains.java.decompiler.code.CodeConstants;
+import org.jetbrains.java.decompiler.main.ClassesProcessor;
+import org.jetbrains.java.decompiler.main.DecompilerContext;
+import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
+import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.*;
+import org.jetbrains.java.decompiler.modules.decompiler.stats.SwitchStatement;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SwitchHelper {
+  public static void simplify(SwitchStatement switchStatement) {
+    SwitchExprent switchExprent = (SwitchExprent)switchStatement.getHeadexprent();
+    Exprent value = switchExprent.getValue();
+    if (isEnumArray(value)) {
+      List<List<Exprent>> caseValues = switchStatement.getCaseValues();
+      Map<Exprent, Exprent> mapping = new HashMap<>(caseValues.size());
+      ArrayExprent array = (ArrayExprent)value;
+      FieldExprent arrayField = (FieldExprent)array.getArray();
+      ClassesProcessor.ClassNode classNode =
+        DecompilerContext.getClassProcessor().getMapRootClasses().get(arrayField.getClassname());
+      if (classNode != null) {
+        MethodWrapper wrapper = classNode.getWrapper().getMethodWrapper(CodeConstants.CLINIT_NAME, "()V");
+        if (wrapper != null && wrapper.root != null) {
+          wrapper.getOrBuildGraph().iterateExprents(exprent -> {
+            if (exprent instanceof AssignmentExprent) {
+              AssignmentExprent assignment = (AssignmentExprent)exprent;
+              Exprent left = assignment.getLeft();
+              if (left.type == Exprent.EXPRENT_ARRAY && ((ArrayExprent)left).getArray().equals(arrayField)) {
+                mapping.put(assignment.getRight(), ((InvocationExprent)((ArrayExprent)left).getIndex()).getInstance());
+              }
+            }
+            return 0;
+          });
+        }
+      }
+
+      List<List<Exprent>> realCaseValues = new ArrayList<>(caseValues.size());
+      for (List<Exprent> caseValue : caseValues) {
+        List<Exprent> values = new ArrayList<>(caseValue.size());
+        realCaseValues.add(values);
+        for (Exprent exprent : caseValue) {
+          if (exprent == null) {
+            values.add(null);
+          }
+          else {
+            Exprent realConst = mapping.get(exprent);
+            if (realConst == null) {
+              DecompilerContext.getLogger()
+                .writeMessage("Unable to simplify switch on enum: " + exprent + " not found, available: " + mapping,
+                              IFernflowerLogger.Severity.ERROR);
+              return;
+            }
+            values.add(realConst.copy());
+          }
+        }
+      }
+      caseValues.clear();
+      caseValues.addAll(realCaseValues);
+      switchExprent.replaceExprent(value, ((InvocationExprent)array.getIndex()).getInstance().copy());
+    }
+  }
+
+  private static boolean isEnumArray(Exprent exprent) {
+    if (exprent instanceof ArrayExprent) {
+      Exprent field = ((ArrayExprent)exprent).getArray();
+      Exprent index = ((ArrayExprent)exprent).getIndex();
+      return field instanceof FieldExprent &&
+             (((FieldExprent)field).getName().startsWith("$SwitchMap") ||
+              (index instanceof InvocationExprent && ((InvocationExprent)index).getName().equals("ordinal")));
+    }
+    return false;
+  }
+}
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorEngine.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorEngine.java
index a61d44c..0d908a2 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorEngine.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorEngine.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.decompose;
 
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
@@ -25,7 +11,7 @@ public class DominatorEngine {
 
   private final Statement statement;
 
-  private final VBStyleCollection<Integer, Integer> colOrderedIDoms = new VBStyleCollection<Integer, Integer>();
+  private final VBStyleCollection<Integer, Integer> colOrderedIDoms = new VBStyleCollection<>();
 
 
   public DominatorEngine(Statement statement) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
index 89e6849..d8b587f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.decompose;
 
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
@@ -27,16 +13,16 @@ public class DominatorTreeExceptionFilter {
   private final Statement statement;
 
   // idom, nodes
-  private final Map<Integer, Set<Integer>> mapTreeBranches = new HashMap<Integer, Set<Integer>>();
+  private final Map<Integer, Set<Integer>> mapTreeBranches = new HashMap<>();
 
   // handler, range nodes
-  private final Map<Integer, Set<Integer>> mapExceptionRanges = new HashMap<Integer, Set<Integer>>();
+  private final Map<Integer, Set<Integer>> mapExceptionRanges = new HashMap<>();
 
   // handler, head dom
-  private Map<Integer, Integer> mapExceptionDoms = new HashMap<Integer, Integer>();
+  private Map<Integer, Integer> mapExceptionDoms = new HashMap<>();
 
   // statement, handler, exit nodes
-  private final Map<Integer, Map<Integer, Integer>> mapExceptionRangeUniqueExit = new HashMap<Integer, Map<Integer, Integer>>();
+  private final Map<Integer, Map<Integer, Integer>> mapExceptionRangeUniqueExit = new HashMap<>();
 
   private DominatorEngine domEngine;
 
@@ -45,7 +31,6 @@ public class DominatorTreeExceptionFilter {
   }
 
   public void initialize() {
-
     domEngine = new DominatorEngine(statement);
     domEngine.initialize();
 
@@ -61,12 +46,11 @@ public class DominatorTreeExceptionFilter {
   }
 
   public boolean acceptStatementPair(Integer head, Integer exit) {
-
     Map<Integer, Integer> filter = mapExceptionRangeUniqueExit.get(head);
     for (Entry<Integer, Integer> entry : filter.entrySet()) {
       if (!head.equals(mapExceptionDoms.get(entry.getKey()))) {
         Integer filterExit = entry.getValue();
-        if (filterExit.intValue() == -1 || !filterExit.equals(exit)) {
+        if (filterExit == -1 || !filterExit.equals(exit)) {
           return false;
         }
       }
@@ -76,19 +60,13 @@ public class DominatorTreeExceptionFilter {
   }
 
   private void buildDominatorTree() {
-
     VBStyleCollection<Integer, Integer> orderedIDoms = domEngine.getOrderedIDoms();
 
     List<Integer> lstKeys = orderedIDoms.getLstKeys();
     for (int index = lstKeys.size() - 1; index >= 0; index--) {
       Integer key = lstKeys.get(index);
       Integer idom = orderedIDoms.get(index);
-
-      Set<Integer> set = mapTreeBranches.get(idom);
-      if (set == null) {
-        mapTreeBranches.put(idom, set = new HashSet<Integer>());
-      }
-      set.add(key);
+      mapTreeBranches.computeIfAbsent(idom, k -> new HashSet<>()).add(key);
     }
 
     Integer firstid = statement.getFirst().id;
@@ -96,12 +74,11 @@ public class DominatorTreeExceptionFilter {
   }
 
   private void buildExceptionRanges() {
-
     for (Statement stat : statement.getStats()) {
       List<Statement> lstPreds = stat.getNeighbours(StatEdge.TYPE_EXCEPTION, Statement.DIRECTION_BACKWARD);
       if (!lstPreds.isEmpty()) {
 
-        Set<Integer> set = new HashSet<Integer>();
+        Set<Integer> set = new HashSet<>();
 
         for (Statement st : lstPreds) {
           set.add(st.id);
@@ -115,8 +92,7 @@ public class DominatorTreeExceptionFilter {
   }
 
   private Map<Integer, Integer> buildExceptionDoms(Integer id) {
-
-    Map<Integer, Integer> map = new HashMap<Integer, Integer>();
+    Map<Integer, Integer> map = new HashMap<>();
 
     Set<Integer> children = mapTreeBranches.get(id);
     if (children != null) {
@@ -137,33 +113,29 @@ public class DominatorTreeExceptionFilter {
     return map;
   }
 
-
   private void buildFilter(Integer id) {
-
-    Map<Integer, Integer> map = new HashMap<Integer, Integer>();
+    Map<Integer, Integer> map = new HashMap<>();
 
     Set<Integer> children = mapTreeBranches.get(id);
     if (children != null) {
       for (Integer childid : children) {
-
         buildFilter(childid);
 
         Map<Integer, Integer> mapChild = mapExceptionRangeUniqueExit.get(childid);
-
         for (Entry<Integer, Set<Integer>> entry : mapExceptionRanges.entrySet()) {
-
           Integer handler = entry.getKey();
           Set<Integer> range = entry.getValue();
 
           if (range.contains(id)) {
 
-            Integer exit = null;
+            Integer exit;
 
             if (!range.contains(childid)) {
               exit = childid;
             }
             else {
-              // exit = map.containsKey(handler)?-1:mapChild.get(handler); FIXME: Eclipse bug?
+              // after replacing 'new Integer(-1)' with '-1' Eclipse throws a NullPointerException on the following line
+              // could be a bug in Eclipse or some obscure specification glitch, FIXME: needs further investigation
               exit = map.containsKey(handler) ? new Integer(-1) : mapChild.get(handler);
             }
 
@@ -181,4 +153,4 @@ public class DominatorTreeExceptionFilter {
   public DominatorEngine getDomEngine() {
     return domEngine;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
index 52338f9..71ef24b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.decompose;
 
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
@@ -28,9 +14,9 @@ public class FastExtendedPostdominanceHelper {
 
   private List<Statement> lstReversePostOrderList;
 
-  private HashMap<Integer, FastFixedSet<Integer>> mapSupportPoints = new HashMap<Integer, FastFixedSet<Integer>>();
+  private HashMap<Integer, FastFixedSet<Integer>> mapSupportPoints = new HashMap<>();
 
-  private final HashMap<Integer, FastFixedSet<Integer>> mapExtPostdominators = new HashMap<Integer, FastFixedSet<Integer>>();
+  private final HashMap<Integer, FastFixedSet<Integer>> mapExtPostdominators = new HashMap<>();
 
   private Statement statement;
 
@@ -40,11 +26,11 @@ public class FastExtendedPostdominanceHelper {
 
     this.statement = statement;
 
-    HashSet<Integer> set = new HashSet<Integer>();
+    HashSet<Integer> set = new HashSet<>();
     for (Statement st : statement.getStats()) {
       set.add(st.id);
     }
-    this.factory = new FastFixedSetFactory<Integer>(set);
+    this.factory = new FastFixedSetFactory<>(set);
 
     lstReversePostOrderList = statement.getReversePostOrderList();
 
@@ -65,8 +51,9 @@ public class FastExtendedPostdominanceHelper {
 
     filterOnDominance(filter);
 
-    HashMap<Integer, Set<Integer>> res = new HashMap<Integer, Set<Integer>>();
-    for (Entry<Integer, FastFixedSet<Integer>> entry : mapExtPostdominators.entrySet()) {
+    Set<Entry<Integer, FastFixedSet<Integer>>> entries = mapExtPostdominators.entrySet();
+    HashMap<Integer, Set<Integer>> res = new HashMap<>(entries.size());
+    for (Entry<Integer, FastFixedSet<Integer>> entry : entries) {
       res.put(entry.getKey(), entry.getValue().toPlainSet());
     }
 
@@ -78,20 +65,20 @@ public class FastExtendedPostdominanceHelper {
 
     DominatorEngine engine = filter.getDomEngine();
 
-    for (Integer head : new HashSet<Integer>(mapExtPostdominators.keySet())) {
+    for (Integer head : new HashSet<>(mapExtPostdominators.keySet())) {
 
       FastFixedSet<Integer> setPostdoms = mapExtPostdominators.get(head);
 
-      LinkedList<Statement> stack = new LinkedList<Statement>();
-      LinkedList<FastFixedSet<Integer>> stackPath = new LinkedList<FastFixedSet<Integer>>();
+      LinkedList<Statement> stack = new LinkedList<>();
+      LinkedList<FastFixedSet<Integer>> stackPath = new LinkedList<>();
 
       stack.add(statement.getStats().getWithKey(head));
       stackPath.add(factory.spawnEmptySet());
 
-      Set<Statement> setVisited = new HashSet<Statement>();
+      Set<Statement> setVisited = new HashSet<>();
 
       setVisited.add(stack.getFirst());
-      
+
       while (!stack.isEmpty()) {
 
         Statement stat = stack.removeFirst();
@@ -109,17 +96,17 @@ public class FastExtendedPostdominanceHelper {
           setPostdoms.complement(path);
           continue;
         }
-        
+
         for (StatEdge edge : stat.getSuccessorEdges(StatEdge.TYPE_REGULAR)) {
-          
+
           Statement edge_destination = edge.getDestination();
-          
+
           if(!setVisited.contains(edge_destination)) {
-            
+
             stack.add(edge_destination);
             stackPath.add(path.getCopy());
-            
-            setVisited.add(edge_destination); 
+
+            setVisited.add(edge_destination);
           }
         }
       }
@@ -130,12 +117,8 @@ public class FastExtendedPostdominanceHelper {
     }
   }
 
-
   private void filterOnExceptionRanges(DominatorTreeExceptionFilter filter) {
-
-
-    for (Integer head : new HashSet<Integer>(mapExtPostdominators.keySet())) {
-
+    for (Integer head : new HashSet<>(mapExtPostdominators.keySet())) {
       FastFixedSet<Integer> set = mapExtPostdominators.get(head);
       for (Iterator<Integer> it = set.iterator(); it.hasNext(); ) {
         if (!filter.acceptStatementPair(head, it.next())) {
@@ -148,64 +131,59 @@ public class FastExtendedPostdominanceHelper {
     }
   }
 
-
   private void removeErroneousNodes() {
-
-    mapSupportPoints = new HashMap<Integer, FastFixedSet<Integer>>();
+    mapSupportPoints = new HashMap<>();
 
     calcReachabilitySuppPoints(StatEdge.TYPE_REGULAR);
 
-    iterateReachability(new IReachabilityAction() {
-      public boolean action(Statement node, HashMap<Integer, FastFixedSet<Integer>> mapSets) {
+    iterateReachability((node, mapSets) -> {
+      Integer nodeid = node.id;
 
-        Integer nodeid = node.id;
+      FastFixedSet<Integer> setReachability = mapSets.get(nodeid);
+      List<FastFixedSet<Integer>> lstPredSets = new ArrayList<>();
 
-        FastFixedSet<Integer> setReachability = mapSets.get(nodeid);
-        List<FastFixedSet<Integer>> lstPredSets = new ArrayList<FastFixedSet<Integer>>();
-
-        for (StatEdge prededge : node.getPredecessorEdges(StatEdge.TYPE_REGULAR)) {
-          FastFixedSet<Integer> setPred = mapSets.get(prededge.getSource().id);
-          if (setPred == null) {
-            setPred = mapSupportPoints.get(prededge.getSource().id);
-          }
-
-          // setPred cannot be empty as it is a reachability set
-          lstPredSets.add(setPred);
+      for (StatEdge prededge : node.getPredecessorEdges(StatEdge.TYPE_REGULAR)) {
+        FastFixedSet<Integer> setPred = mapSets.get(prededge.getSource().id);
+        if (setPred == null) {
+          setPred = mapSupportPoints.get(prededge.getSource().id);
         }
 
-        for (Integer id : setReachability.toPlainSet()) {
+        // setPred cannot be empty as it is a reachability set
+        lstPredSets.add(setPred);
+      }
 
-          FastFixedSet<Integer> setReachabilityCopy = setReachability.getCopy();
+      for (Integer id : setReachability) {
 
-          FastFixedSet<Integer> setIntersection = factory.spawnEmptySet();
-          boolean isIntersectionInitialized = false;
+        FastFixedSet<Integer> setReachabilityCopy = setReachability.getCopy();
 
-          for (FastFixedSet<Integer> predset : lstPredSets) {
-            if (predset.contains(id)) {
-              if (!isIntersectionInitialized) {
-                setIntersection.union(predset);
-                isIntersectionInitialized = true;
-              }
-              else {
-                setIntersection.intersection(predset);
-              }
+        FastFixedSet<Integer> setIntersection = factory.spawnEmptySet();
+        boolean isIntersectionInitialized = false;
+
+        for (FastFixedSet<Integer> predset : lstPredSets) {
+          if (predset.contains(id)) {
+            if (!isIntersectionInitialized) {
+              setIntersection.union(predset);
+              isIntersectionInitialized = true;
+            }
+            else {
+              setIntersection.intersection(predset);
             }
           }
-
-          if (nodeid != id.intValue()) {
-            setIntersection.add(nodeid);
-          }
-          else {
-            setIntersection.remove(nodeid);
-          }
-
-          setReachabilityCopy.complement(setIntersection);
-
-          mapExtPostdominators.get(id).complement(setReachabilityCopy);
         }
 
-        return false;
+        if (nodeid != id.intValue()) {
+          setIntersection.add(nodeid);
+        }
+        else {
+          setIntersection.remove(nodeid);
+        }
+
+        setReachabilityCopy.complement(setIntersection);
+
+        mapExtPostdominators.get(id).complement(setReachabilityCopy);
       }
+
+      return false;
     }, StatEdge.TYPE_REGULAR);
 
     // exception handlers cannot be postdominator nodes
@@ -228,9 +206,7 @@ public class FastExtendedPostdominanceHelper {
     }
   }
 
-
   private void calcDefaultReachableSets() {
-
     int edgetype = StatEdge.TYPE_REGULAR | StatEdge.TYPE_EXCEPTION;
 
     calcReachabilitySuppPoints(edgetype);
@@ -239,53 +215,43 @@ public class FastExtendedPostdominanceHelper {
       mapExtPostdominators.put(stat.id, factory.spawnEmptySet());
     }
 
-    iterateReachability(new IReachabilityAction() {
-      public boolean action(Statement node, HashMap<Integer, FastFixedSet<Integer>> mapSets) {
+    iterateReachability((node, mapSets) -> {
+      Integer nodeid = node.id;
+      FastFixedSet<Integer> setReachability = mapSets.get(nodeid);
 
-        Integer nodeid = node.id;
-        FastFixedSet<Integer> setReachability = mapSets.get(nodeid);
-
-        for (Integer id : setReachability.toPlainSet()) {
-          mapExtPostdominators.get(id).add(nodeid);
-        }
-
-        return false;
+      for (Integer id : setReachability) {
+        mapExtPostdominators.get(id).add(nodeid);
       }
+
+      return false;
     }, edgetype);
   }
 
-
   private void calcReachabilitySuppPoints(final int edgetype) {
+    iterateReachability((node, mapSets) -> {
+      // consider to be a support point
+      for (StatEdge sucedge : node.getAllSuccessorEdges()) {
+        if ((sucedge.getType() & edgetype) != 0) {
+          if (mapSets.containsKey(sucedge.getDestination().id)) {
+            FastFixedSet<Integer> setReachability = mapSets.get(node.id);
 
-    iterateReachability(new IReachabilityAction() {
-      public boolean action(Statement node, HashMap<Integer, FastFixedSet<Integer>> mapSets) {
-
-        // consider to be a support point
-        for (StatEdge sucedge : node.getAllSuccessorEdges()) {
-          if ((sucedge.getType() & edgetype) != 0) {
-            if (mapSets.containsKey(sucedge.getDestination().id)) {
-              FastFixedSet<Integer> setReachability = mapSets.get(node.id);
-
-              if (!InterpreterUtil.equalObjects(setReachability, mapSupportPoints.get(node.id))) {
-                mapSupportPoints.put(node.id, setReachability);
-                return true;
-              }
+            if (!InterpreterUtil.equalObjects(setReachability, mapSupportPoints.get(node.id))) {
+              mapSupportPoints.put(node.id, setReachability);
+              return true;
             }
           }
         }
-
-        return false;
       }
+
+      return false;
     }, edgetype);
   }
 
   private void iterateReachability(IReachabilityAction action, int edgetype) {
-
     while (true) {
-
       boolean iterate = false;
 
-      HashMap<Integer, FastFixedSet<Integer>> mapSets = new HashMap<Integer, FastFixedSet<Integer>>();
+      HashMap<Integer, FastFixedSet<Integer>> mapSets = new HashMap<>();
 
       for (Statement stat : lstReversePostOrderList) {
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java
index fa5ccf3..01a32f9 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.decompose;
 
 import org.jetbrains.java.decompiler.util.VBStyleCollection;
@@ -24,7 +10,7 @@ public class GenericDominatorEngine {
 
   private final IGraph graph;
 
-  private final VBStyleCollection<IGraphNode, IGraphNode> colOrderedIDoms = new VBStyleCollection<IGraphNode, IGraphNode>();
+  private final VBStyleCollection<IGraphNode, IGraphNode> colOrderedIDoms = new VBStyleCollection<>();
 
   private Set<? extends IGraphNode> setRoots;
 
@@ -126,10 +112,6 @@ public class GenericDominatorEngine {
     }
   }
 
-  public VBStyleCollection<IGraphNode, IGraphNode> getOrderedIDoms() {
-    return colOrderedIDoms;
-  }
-
   public boolean isDominator(IGraphNode node, IGraphNode dom) {
 
     while (!node.equals(dom)) {
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraph.java
index faaf4c6..6ad7439 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraph.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.decompose;
 
 import java.util.List;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraphNode.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraphNode.java
index 19d59b5..8dd357b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraphNode.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraphNode.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.decompose;
 
 import java.util.List;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
index 7614807..810291d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.deobfuscator;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -22,6 +8,8 @@ import org.jetbrains.java.decompiler.code.SimpleInstructionSequence;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph;
 import org.jetbrains.java.decompiler.code.cfg.ExceptionRangeCFG;
+import org.jetbrains.java.decompiler.main.DecompilerContext;
+import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
 import org.jetbrains.java.decompiler.modules.decompiler.decompose.GenericDominatorEngine;
 import org.jetbrains.java.decompiler.modules.decompiler.decompose.IGraph;
 import org.jetbrains.java.decompiler.modules.decompiler.decompose.IGraphNode;
@@ -48,7 +36,7 @@ public class ExceptionDeobfuscator {
 
   public static void restorePopRanges(ControlFlowGraph graph) {
 
-    List<Range> lstRanges = new ArrayList<Range>();
+    List<Range> lstRanges = new ArrayList<>();
 
     // aggregate ranges
     for (ExceptionRangeCFG range : graph.getExceptions()) {
@@ -63,7 +51,7 @@ public class ExceptionDeobfuscator {
 
       if (!found) {
         // doesn't matter, which range chosen
-        lstRanges.add(new Range(range.getHandler(), range.getUniqueExceptionsString(), new HashSet<BasicBlock>(range.getProtectedRange()), range));
+        lstRanges.add(new Range(range.getHandler(), range.getUniqueExceptionsString(), new HashSet<>(range.getProtectedRange()), range));
       }
     }
 
@@ -81,13 +69,13 @@ public class ExceptionDeobfuscator {
 
           if (firstinstr.opcode == CodeConstants.opc_pop ||
               firstinstr.opcode == CodeConstants.opc_astore) {
-            Set<BasicBlock> setrange = new HashSet<BasicBlock>(range.protectedRange);
+            Set<BasicBlock> setrange = new HashSet<>(range.protectedRange);
 
             for (Range range_super : lstRanges) { // finally or strict superset
 
               if (range != range_super) {
 
-                Set<BasicBlock> setrange_super = new HashSet<BasicBlock>(range_super.protectedRange);
+                Set<BasicBlock> setrange_super = new HashSet<>(range_super.protectedRange);
 
                 if (!setrange.contains(range_super.handler) && !setrange_super.contains(handler)
                     && (range_super.uniqueStr == null || setrange_super.containsAll(setrange))) {
@@ -113,7 +101,7 @@ public class ExceptionDeobfuscator {
                       graph.getBlocks().addWithKey(newblock, newblock.id);
 
 
-                      List<BasicBlock> lstTemp = new ArrayList<BasicBlock>();
+                      List<BasicBlock> lstTemp = new ArrayList<>();
                       lstTemp.addAll(handler.getPreds());
                       lstTemp.addAll(handler.getPredExceptions());
 
@@ -159,7 +147,7 @@ public class ExceptionDeobfuscator {
 
   public static void insertEmptyExceptionHandlerBlocks(ControlFlowGraph graph) {
 
-    Set<BasicBlock> setVisited = new HashSet<BasicBlock>();
+    Set<BasicBlock> setVisited = new HashSet<>();
 
     for (ExceptionRangeCFG range : graph.getExceptions()) {
       BasicBlock handler = range.getHandler();
@@ -172,9 +160,8 @@ public class ExceptionDeobfuscator {
       BasicBlock emptyblock = new BasicBlock(++graph.last_id);
       graph.getBlocks().addWithKey(emptyblock, emptyblock.id);
 
-      List<BasicBlock> lstTemp = new ArrayList<BasicBlock>();
       // only exception predecessors considered
-      lstTemp.addAll(handler.getPredExceptions());
+      List<BasicBlock> lstTemp = new ArrayList<>(handler.getPredExceptions());
 
       // replace predecessors
       for (BasicBlock pred : lstTemp) {
@@ -226,12 +213,14 @@ public class ExceptionDeobfuscator {
   public static void removeCircularRanges(final ControlFlowGraph graph) {
 
     GenericDominatorEngine engine = new GenericDominatorEngine(new IGraph() {
+      @Override
       public List<? extends IGraphNode> getReversePostOrderList() {
         return graph.getReversePostOrder();
       }
 
+      @Override
       public Set<? extends IGraphNode> getRoots() {
-        return new HashSet<IGraphNode>(Arrays.asList(new IGraphNode[]{graph.getFirst()}));
+        return new HashSet<>(Collections.singletonList(graph.getFirst()));
       }
     });
 
@@ -246,7 +235,7 @@ public class ExceptionDeobfuscator {
 
       if (rangeList.contains(handler)) {  // TODO: better removing strategy
 
-        List<BasicBlock> lstRemBlocks = getReachableBlocksRestricted(range, engine);
+        List<BasicBlock> lstRemBlocks = getReachableBlocksRestricted(range.getHandler(), range, engine);
 
         if (lstRemBlocks.size() < rangeList.size() || rangeList.size() == 1) {
           for (BasicBlock block : lstRemBlocks) {
@@ -262,25 +251,24 @@ public class ExceptionDeobfuscator {
     }
   }
 
-  private static List<BasicBlock> getReachableBlocksRestricted(ExceptionRangeCFG range, GenericDominatorEngine engine) {
+  private static List<BasicBlock> getReachableBlocksRestricted(BasicBlock start, ExceptionRangeCFG range, GenericDominatorEngine engine) {
 
-    List<BasicBlock> lstRes = new ArrayList<BasicBlock>();
+    List<BasicBlock> lstRes = new ArrayList<>();
 
-    LinkedList<BasicBlock> stack = new LinkedList<BasicBlock>();
-    Set<BasicBlock> setVisited = new HashSet<BasicBlock>();
+    LinkedList<BasicBlock> stack = new LinkedList<>();
+    Set<BasicBlock> setVisited = new HashSet<>();
 
-    BasicBlock handler = range.getHandler();
-    stack.addFirst(handler);
+    stack.addFirst(start);
 
     while (!stack.isEmpty()) {
       BasicBlock block = stack.removeFirst();
 
       setVisited.add(block);
 
-      if (range.getProtectedRange().contains(block) && engine.isDominator(block, handler)) {
+      if (range.getProtectedRange().contains(block) && engine.isDominator(block, start)) {
         lstRes.add(block);
 
-        List<BasicBlock> lstSuccs = new ArrayList<BasicBlock>(block.getSuccs());
+        List<BasicBlock> lstSuccs = new ArrayList<>(block.getSuccs());
         lstSuccs.addAll(block.getSuccExceptions());
 
         for (BasicBlock succ : lstSuccs) {
@@ -294,23 +282,17 @@ public class ExceptionDeobfuscator {
     return lstRes;
   }
 
-
   public static boolean hasObfuscatedExceptions(ControlFlowGraph graph) {
-
-    Map<BasicBlock, Set<BasicBlock>> mapRanges = new HashMap<BasicBlock, Set<BasicBlock>>();
+    Map<BasicBlock, Set<BasicBlock>> mapRanges = new HashMap<>();
     for (ExceptionRangeCFG range : graph.getExceptions()) {
-      Set<BasicBlock> set = mapRanges.get(range.getHandler());
-      if (set == null) {
-        mapRanges.put(range.getHandler(), set = new HashSet<BasicBlock>());
-      }
-      set.addAll(range.getProtectedRange());
+      mapRanges.computeIfAbsent(range.getHandler(), k -> new HashSet<>()).addAll(range.getProtectedRange());
     }
 
     for (Entry<BasicBlock, Set<BasicBlock>> ent : mapRanges.entrySet()) {
-      Set<BasicBlock> setEntries = new HashSet<BasicBlock>();
+      Set<BasicBlock> setEntries = new HashSet<>();
 
       for (BasicBlock block : ent.getValue()) {
-        Set<BasicBlock> setTemp = new HashSet<BasicBlock>(block.getPreds());
+        Set<BasicBlock> setTemp = new HashSet<>(block.getPreds());
         setTemp.removeAll(ent.getValue());
 
         if (!setTemp.isEmpty()) {
@@ -327,4 +309,140 @@ public class ExceptionDeobfuscator {
 
     return false;
   }
-}
+
+  public static boolean handleMultipleEntryExceptionRanges(ControlFlowGraph graph) {
+    GenericDominatorEngine engine = new GenericDominatorEngine(new IGraph() {
+      @Override
+      public List<? extends IGraphNode> getReversePostOrderList() {
+        return graph.getReversePostOrder();
+      }
+
+      @Override
+      public Set<? extends IGraphNode> getRoots() {
+        return new HashSet<>(Collections.singletonList(graph.getFirst()));
+      }
+    });
+
+    engine.initialize();
+
+    boolean found;
+
+    while (true) {
+      found = false;
+      boolean splitted = false;
+
+      for (ExceptionRangeCFG range : graph.getExceptions()) {
+        Set<BasicBlock> setEntries = getRangeEntries(range);
+
+        if (setEntries.size() > 1) { // multiple-entry protected range
+          found = true;
+
+          if (splitExceptionRange(range, setEntries, graph, engine)) {
+            splitted = true;
+            break;
+          }
+        }
+      }
+
+      if (!splitted) {
+        break;
+      }
+    }
+
+    return !found;
+  }
+
+  private static Set<BasicBlock> getRangeEntries(ExceptionRangeCFG range) {
+    Set<BasicBlock> setEntries = new HashSet<>();
+    Set<BasicBlock> setRange = new HashSet<>(range.getProtectedRange());
+
+    for (BasicBlock block : range.getProtectedRange()) {
+      Set<BasicBlock> setPreds = new HashSet<>(block.getPreds());
+      setPreds.removeAll(setRange);
+
+      if (!setPreds.isEmpty()) {
+        setEntries.add(block);
+      }
+    }
+
+    return setEntries;
+  }
+
+  private static boolean splitExceptionRange(ExceptionRangeCFG range,
+                                             Set<BasicBlock> setEntries,
+                                             ControlFlowGraph graph,
+                                             GenericDominatorEngine engine) {
+    for (BasicBlock entry : setEntries) {
+      List<BasicBlock> lstSubrangeBlocks = getReachableBlocksRestricted(entry, range, engine);
+      if (!lstSubrangeBlocks.isEmpty() && lstSubrangeBlocks.size() < range.getProtectedRange().size()) {
+        // add new range
+        ExceptionRangeCFG subRange = new ExceptionRangeCFG(lstSubrangeBlocks, range.getHandler(), range.getExceptionTypes());
+        graph.getExceptions().add(subRange);
+        // shrink the original range
+        range.getProtectedRange().removeAll(lstSubrangeBlocks);
+        return true;
+      }
+      else {
+        // should not happen
+        DecompilerContext.getLogger().writeMessage("Inconsistency found while splitting protected range", IFernflowerLogger.Severity.WARN);
+      }
+    }
+
+    return false;
+  }
+
+  public static void insertDummyExceptionHandlerBlocks(ControlFlowGraph graph, int bytecode_version) {
+    Map<BasicBlock, Set<ExceptionRangeCFG>> mapRanges = new HashMap<>();
+    for (ExceptionRangeCFG range : graph.getExceptions()) {
+      mapRanges.computeIfAbsent(range.getHandler(), k -> new HashSet<>()).add(range);
+    }
+
+    for (Entry<BasicBlock, Set<ExceptionRangeCFG>> ent : mapRanges.entrySet()) {
+      BasicBlock handler = ent.getKey();
+      Set<ExceptionRangeCFG> ranges = ent.getValue();
+
+      if (ranges.size() == 1) {
+        continue;
+      }
+
+      for (ExceptionRangeCFG range : ranges) {
+
+        // add some dummy instructions to prevent optimizing away the empty block  
+        SimpleInstructionSequence seq = new SimpleInstructionSequence();
+        seq.addInstruction(Instruction.create(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{0}), -1);
+        seq.addInstruction(Instruction.create(CodeConstants.opc_pop, false, CodeConstants.GROUP_GENERAL, bytecode_version, null), -1);
+
+        BasicBlock dummyBlock = new BasicBlock(++graph.last_id);
+        dummyBlock.setSeq(seq);
+
+        graph.getBlocks().addWithKey(dummyBlock, dummyBlock.id);
+
+        // only exception predecessors from this range considered
+        List<BasicBlock> lstPredExceptions = new ArrayList<>(handler.getPredExceptions());
+        lstPredExceptions.retainAll(range.getProtectedRange());
+
+        // replace predecessors
+        for (BasicBlock pred : lstPredExceptions) {
+          pred.replaceSuccessor(handler, dummyBlock);
+        }
+
+        // replace handler
+        range.setHandler(dummyBlock);
+        // add common exception edges
+        Set<BasicBlock> commonHandlers = new HashSet<>(handler.getSuccExceptions());
+        for (BasicBlock pred : lstPredExceptions) {
+          commonHandlers.retainAll(pred.getSuccExceptions());
+        }
+        // TODO: more sanity checks?
+        for (BasicBlock commonHandler : commonHandlers) {
+          ExceptionRangeCFG commonRange = graph.getExceptionRange(commonHandler, handler);
+
+          dummyBlock.addSuccessorException(commonHandler);
+          commonRange.getProtectedRange().add(dummyBlock);
+        }
+
+        dummyBlock.addSuccessor(handler);
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
index 42ba76f..7fecbd9 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.deobfuscator;
 
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
@@ -30,16 +16,16 @@ public class IrreducibleCFGDeobfuscator {
   public static boolean isStatementIrreducible(Statement statement) {
 
     class Node {
-      public Integer id;
-      public final Set<Node> preds = new HashSet<Node>();
-      public final Set<Node> succs = new HashSet<Node>();
+      public final Integer id;
+      public final Set<Node> preds = new HashSet<>();
+      public final Set<Node> succs = new HashSet<>();
 
-      public Node(Integer id) {
+      Node(Integer id) {
         this.id = id;
       }
     }
 
-    HashMap<Integer, Node> mapNodes = new HashMap<Integer, Node>();
+    HashMap<Integer, Node> mapNodes = new HashMap<>();
 
     // checking exceptions and creating nodes
     for (Statement stat : statement.getStats()) {
@@ -145,7 +131,7 @@ public class IrreducibleCFGDeobfuscator {
     StatEdge enteredge = splitnode.getPredecessorEdges(StatEdge.TYPE_REGULAR).iterator().next();
 
     // copy the smallest statement
-    Statement splitcopy = copyStatement(splitnode, null, new HashMap<Statement, Statement>());
+    Statement splitcopy = copyStatement(splitnode, null, new HashMap<>());
     initCopiedStatement(splitcopy);
 
     // insert the copy
@@ -172,15 +158,13 @@ public class IrreducibleCFGDeobfuscator {
 
   private static int getStatementSize(Statement statement) {
 
-    int res = 0;
+    int res;
 
     if (statement.type == Statement.TYPE_BASICBLOCK) {
       res = ((BasicBlockStatement)statement).getBlock().getSeq().length();
     }
     else {
-      for (Statement stat : statement.getStats()) {
-        res += getStatementSize(stat);
-      }
+      res = statement.getStats().stream().mapToInt(IrreducibleCFGDeobfuscator::getStatementSize).sum();
     }
 
     return res;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
index 905bc21..c9c9c7f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
@@ -1,39 +1,26 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.List;
 
 public class AnnotationExprent extends Exprent {
-
   public static final int ANNOTATION_NORMAL = 1;
   public static final int ANNOTATION_MARKER = 2;
   public static final int ANNOTATION_SINGLE_ELEMENT = 3;
 
   private final String className;
-  private final List<String> parNames;
-  private final List<Exprent> parValues;
+  private final List<? extends String> parNames;
+  private final List<? extends Exprent> parValues;
 
-  public AnnotationExprent(String className, List<String> parNames, List<Exprent> parValues) {
+  public AnnotationExprent(String className, List<? extends String> parNames, List<? extends Exprent> parValues) {
     super(EXPRENT_ANNOTATION);
     this.className = className;
     this.parNames = parNames;
@@ -45,29 +32,38 @@ public class AnnotationExprent extends Exprent {
     TextBuffer buffer = new TextBuffer();
 
     buffer.appendIndent(indent);
-    buffer.append("@");
+    buffer.append('@');
     buffer.append(DecompilerContext.getImportCollector().getShortName(ExprProcessor.buildJavaClassName(className)));
 
-    if (!parNames.isEmpty()) {
-      buffer.append("(");
-      if (parNames.size() == 1 && "value".equals(parNames.get(0))) {
-        buffer.append(parValues.get(0).toJava(indent + 1, tracer));
-      }
-      else {
-        for (int i = 0; i < parNames.size(); i++) {
+    int type = getAnnotationType();
+
+    if (type != ANNOTATION_MARKER) {
+      buffer.append('(');
+
+      boolean oneLiner = type == ANNOTATION_SINGLE_ELEMENT || indent < 0;
+
+      for (int i = 0; i < parNames.size(); i++) {
+        if (!oneLiner) {
           buffer.appendLineSeparator().appendIndent(indent + 1);
+        }
+
+        if (type != ANNOTATION_SINGLE_ELEMENT) {
           buffer.append(parNames.get(i));
           buffer.append(" = ");
-          buffer.append(parValues.get(i).toJava(indent + 2, tracer));
-
-          if (i < parNames.size() - 1) {
-            buffer.append(",");
-          }
         }
+
+        buffer.append(parValues.get(i).toJava(0, tracer));
+
+        if (i < parNames.size() - 1) {
+          buffer.append(',');
+        }
+      }
+
+      if (!oneLiner) {
         buffer.appendLineSeparator().appendIndent(indent);
       }
 
-      buffer.append(")");
+      buffer.append(')');
     }
 
     return buffer;
@@ -92,11 +88,11 @@ public class AnnotationExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof AnnotationExprent)) return false;
+    if (!(o instanceof AnnotationExprent)) return false;
 
     AnnotationExprent ann = (AnnotationExprent)o;
     return className.equals(ann.className) &&
            InterpreterUtil.equalLists(parNames, ann.parNames) &&
            InterpreterUtil.equalLists(parValues, ann.parValues);
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
index 8f7269b..753a0a6 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
@@ -1,33 +1,18 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
 public class ArrayExprent extends Exprent {
-
   private Exprent array;
   private Exprent index;
   private final VarType hardType;
@@ -57,10 +42,12 @@ public class ArrayExprent extends Exprent {
     }
   }
 
+  @Override
   public int getExprentUse() {
     return array.getExprentUse() & index.getExprentUse() & Exprent.MULTIPLE_USES;
   }
 
+  @Override
   public CheckTypesResult checkExprTypeBounds() {
     CheckTypesResult result = new CheckTypesResult();
     result.addMinTypeExprent(index, VarType.VARTYPE_BYTECHAR);
@@ -68,8 +55,9 @@ public class ArrayExprent extends Exprent {
     return result;
   }
 
+  @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     lst.add(array);
     lst.add(index);
     return lst;
@@ -91,7 +79,7 @@ public class ArrayExprent extends Exprent {
 
     tracer.addMapping(bytecode);
 
-    return res.append("[").append(index.toJava(indent, tracer)).append("]");
+    return res.append('[').append(index.toJava(indent, tracer)).append(']');
   }
 
   @Override
@@ -107,7 +95,7 @@ public class ArrayExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof ArrayExprent)) return false;
+    if (!(o instanceof ArrayExprent)) return false;
 
     ArrayExprent arr = (ArrayExprent)o;
     return InterpreterUtil.equalObjects(array, arr.getArray()) &&
@@ -121,4 +109,4 @@ public class ArrayExprent extends Exprent {
   public Exprent getIndex() {
     return index;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
index af95d15..0dcb63d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
@@ -1,30 +1,18 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 
 import java.util.List;
 
 public class AssertExprent extends Exprent {
 
-  private final List<Exprent> parameters;
+  private final List<? extends Exprent> parameters;
 
-  public AssertExprent(List<Exprent> parameters) {
+  public AssertExprent(List<? extends Exprent> parameters) {
     super(EXPRENT_ASSERT);
     this.parameters = parameters;
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
index ef08e12..c590ac5 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
@@ -1,30 +1,18 @@
 /*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
 import org.jetbrains.java.decompiler.struct.StructField;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -87,7 +75,7 @@ public class AssignmentExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     lst.add(left);
     lst.add(right);
     return lst;
@@ -174,7 +162,7 @@ public class AssignmentExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof AssignmentExprent)) return false;
+    if (!(o instanceof AssignmentExprent)) return false;
 
     AssignmentExprent as = (AssignmentExprent)o;
     return InterpreterUtil.equalObjects(left, as.getLeft()) &&
@@ -190,10 +178,6 @@ public class AssignmentExprent extends Exprent {
     return left;
   }
 
-  public void setLeft(Exprent left) {
-    this.left = left;
-  }
-
   public Exprent getRight() {
     return right;
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
index 31fe3cd..d250db9 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
@@ -1,23 +1,8 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
@@ -25,32 +10,34 @@ import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
-import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.*;
 import java.util.Map.Entry;
 
 public class ConstExprent extends Exprent {
-  private static final Map<Integer, String> CHAR_ESCAPES = new HashMap<Integer, String>() {{
-    put(new Integer(0x8), "\\b");   /* \u0008: backspace BS */
-    put(new Integer(0x9), "\\t");   /* \u0009: horizontal tab HT */
-    put(new Integer(0xA), "\\n");   /* \u000a: linefeed LF */
-    put(new Integer(0xC), "\\f");   /* \u000c: form feed FF */
-    put(new Integer(0xD), "\\r");   /* \u000d: carriage return CR */
-    put(new Integer(0x22), "\\\""); /* \u0022: double quote " */
-    put(new Integer(0x27), "\\\'"); /* \u0027: single quote ' */
-    put(new Integer(0x5C), "\\\\"); /* \u005c: backslash \ */
-  }};
+  private static final Map<Integer, String> CHAR_ESCAPES;
+  static {
+    CHAR_ESCAPES = new HashMap<>();
+    CHAR_ESCAPES.put(0x8, "\\b");   /* \u0008: backspace BS */
+    CHAR_ESCAPES.put(0x9, "\\t");   /* \u0009: horizontal tab HT */
+    CHAR_ESCAPES.put(0xA, "\\n");   /* \u000a: linefeed LF */
+    CHAR_ESCAPES.put(0xC, "\\f");   /* \u000c: form feed FF */
+    CHAR_ESCAPES.put(0xD, "\\r");   /* \u000d: carriage return CR */
+    //CHAR_ESCAPES.put(0x22, "\\\""); /* \u0022: double quote " */
+    CHAR_ESCAPES.put(0x27, "\\\'"); /* \u0027: single quote ' */
+    CHAR_ESCAPES.put(0x5C, "\\\\"); /* \u005c: backslash \ */
+  }
 
   private VarType constType;
   private final Object value;
   private final boolean boolPermitted;
 
   public ConstExprent(int val, boolean boolPermitted, Set<Integer> bytecodeOffsets) {
-    this(guessType(val, boolPermitted), new Integer(val), boolPermitted, bytecodeOffsets);
+    this(guessType(val, boolPermitted), val, boolPermitted, bytecodeOffsets);
   }
 
   public ConstExprent(VarType constType, Object value, Set<Integer> bytecodeOffsets) {
@@ -108,8 +95,9 @@ public class ConstExprent extends Exprent {
     return Exprent.MULTIPLE_USES | Exprent.SIDE_EFFECTS_FREE;
   }
 
+  @Override
   public List<Exprent> getAllExprents() {
-    return new ArrayList<Exprent>();
+    return new ArrayList<>();
   }
 
   @Override
@@ -122,158 +110,132 @@ public class ConstExprent extends Exprent {
     if (constType.type != CodeConstants.TYPE_NULL && value == null) {
       return new TextBuffer(ExprProcessor.getCastTypeName(constType));
     }
-    else {
-      switch (constType.type) {
-        case CodeConstants.TYPE_BOOLEAN:
-          return new TextBuffer(Boolean.toString(((Integer)value).intValue() != 0));
-        case CodeConstants.TYPE_CHAR:
-          Integer val = (Integer)value;
-          String ret = CHAR_ESCAPES.get(val);
-          if (ret == null) {
-            char c = (char)val.intValue();
-            if (isPrintableAscii(c) || !ascii && TextUtil.isPrintableUnicode(c)) {
-              ret = String.valueOf(c);
-            }
-            else {
-              ret = TextUtil.charToUnicodeLiteral(c);
-            }
-          }
-          return new TextBuffer(ret).enclose("'", "'");
-        case CodeConstants.TYPE_BYTE:
-        case CodeConstants.TYPE_BYTECHAR:
-        case CodeConstants.TYPE_SHORT:
-        case CodeConstants.TYPE_SHORTCHAR:
-        case CodeConstants.TYPE_INT:
-          int ival = ((Integer)value).intValue();
 
-          String intfield;
-          if (literal) {
-            return new TextBuffer(value.toString());
-          }
-          else if (ival == Integer.MAX_VALUE) {
-            intfield = "MAX_VALUE";
-          }
-          else if (ival == Integer.MIN_VALUE) {
-            intfield = "MIN_VALUE";
+    switch (constType.type) {
+      case CodeConstants.TYPE_BOOLEAN:
+        return new TextBuffer(Boolean.toString((Integer)value != 0));
+
+      case CodeConstants.TYPE_CHAR:
+        Integer val = (Integer)value;
+        String ret = CHAR_ESCAPES.get(val);
+        if (ret == null) {
+          char c = (char)val.intValue();
+          if (isPrintableAscii(c) || !ascii && TextUtil.isPrintableUnicode(c)) {
+            ret = String.valueOf(c);
           }
           else {
-            return new TextBuffer(value.toString());
+            ret = TextUtil.charToUnicodeLiteral(c);
           }
-          return new FieldExprent(intfield, "java/lang/Integer", true, null, FieldDescriptor.INTEGER_DESCRIPTOR, bytecode).toJava(0, tracer);
-        case CodeConstants.TYPE_LONG:
-          long lval = ((Long)value).longValue();
+        }
+        return new TextBuffer(ret).enclose("'", "'");
 
-          String longfield;
-          if (literal) {
-            return new TextBuffer(value.toString()).append("L");
+      case CodeConstants.TYPE_BYTE:
+      case CodeConstants.TYPE_BYTECHAR:
+      case CodeConstants.TYPE_SHORT:
+      case CodeConstants.TYPE_SHORTCHAR:
+      case CodeConstants.TYPE_INT:
+        int intVal = (Integer)value;
+        if (!literal) {
+          if (intVal == Integer.MAX_VALUE) {
+            return new FieldExprent("MAX_VALUE", "java/lang/Integer", true, null, FieldDescriptor.INTEGER_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (lval == Long.MAX_VALUE) {
-            longfield = "MAX_VALUE";
+          else if (intVal == Integer.MIN_VALUE) {
+            return new FieldExprent("MIN_VALUE", "java/lang/Integer", true, null, FieldDescriptor.INTEGER_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (lval == Long.MIN_VALUE) {
-            longfield = "MIN_VALUE";
-          }
-          else {
-            return new TextBuffer(value.toString()).append("L");
-          }
-          return new FieldExprent(longfield, "java/lang/Long", true, null, FieldDescriptor.LONG_DESCRIPTOR, bytecode).toJava(0, tracer);
-        case CodeConstants.TYPE_DOUBLE:
-          double dval = ((Double)value).doubleValue();
+        }
+        return new TextBuffer(value.toString());
 
-          String doublefield;
-          if (literal) {
-            if (Double.isNaN(dval)) {
-              return new TextBuffer("0.0D / 0.0");
-            }
-            else if (dval == Double.POSITIVE_INFINITY) {
-              return new TextBuffer("1.0D / 0.0");
-            }
-            else if (dval == Double.NEGATIVE_INFINITY) {
-              return new TextBuffer("-1.0D / 0.0");
-            }
-            else {
-              return new TextBuffer(value.toString()).append("D");
-            }
+      case CodeConstants.TYPE_LONG:
+        long longVal = (Long)value;
+        if (!literal) {
+          if (longVal == Long.MAX_VALUE) {
+            return new FieldExprent("MAX_VALUE", "java/lang/Long", true, null, FieldDescriptor.LONG_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (Double.isNaN(dval)) {
-            doublefield = "NaN";
+          else if (longVal == Long.MIN_VALUE) {
+            return new FieldExprent("MIN_VALUE", "java/lang/Long", true, null, FieldDescriptor.LONG_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (dval == Double.POSITIVE_INFINITY) {
-            doublefield = "POSITIVE_INFINITY";
-          }
-          else if (dval == Double.NEGATIVE_INFINITY) {
-            doublefield = "NEGATIVE_INFINITY";
-          }
-          else if (dval == Double.MAX_VALUE) {
-            doublefield = "MAX_VALUE";
-          }
-          else if (dval == Double.MIN_VALUE) {
-            doublefield = "MIN_VALUE";
-          }
-          else {
-            return new TextBuffer(value.toString()).append("D");
-          }
-          return new FieldExprent(doublefield, "java/lang/Double", true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
-        case CodeConstants.TYPE_FLOAT:
-          float fval = ((Float)value).floatValue();
+        }
+        return new TextBuffer(value.toString()).append('L');
 
-          String floatfield;
-          if (literal) {
-            if (Double.isNaN(fval)) {
-              return new TextBuffer("0.0F / 0.0");
-            }
-            else if (fval == Double.POSITIVE_INFINITY) {
-              return new TextBuffer("1.0F / 0.0");
-            }
-            else if (fval == Double.NEGATIVE_INFINITY) {
-              return new TextBuffer("-1.0F / 0.0");
-            }
-            else {
-              return new TextBuffer(value.toString()).append("F");
-            }
+      case CodeConstants.TYPE_FLOAT:
+        float floatVal = (Float)value;
+        if (!literal) {
+          if (Float.isNaN(floatVal)) {
+            return new FieldExprent("NaN", "java/lang/Float", true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (Float.isNaN(fval)) {
-            floatfield = "NaN";
+          else if (floatVal == Float.POSITIVE_INFINITY) {
+            return new FieldExprent("POSITIVE_INFINITY", "java/lang/Float", true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (fval == Float.POSITIVE_INFINITY) {
-            floatfield = "POSITIVE_INFINITY";
+          else if (floatVal == Float.NEGATIVE_INFINITY) {
+            return new FieldExprent("NEGATIVE_INFINITY", "java/lang/Float", true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (fval == Float.NEGATIVE_INFINITY) {
-            floatfield = "NEGATIVE_INFINITY";
+          else if (floatVal == Float.MAX_VALUE) {
+            return new FieldExprent("MAX_VALUE", "java/lang/Float", true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (fval == Float.MAX_VALUE) {
-            floatfield = "MAX_VALUE";
+          else if (floatVal == Float.MIN_VALUE) {
+            return new FieldExprent("MIN_VALUE", "java/lang/Float", true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-          else if (fval == Float.MIN_VALUE) {
-            floatfield = "MIN_VALUE";
-          }
-          else {
-            return new TextBuffer(value.toString()).append("F");
-          }
-          return new FieldExprent(floatfield, "java/lang/Float", true, null, FieldDescriptor.FLOAT_DESCRIPTOR, bytecode).toJava(0, tracer);
-        case CodeConstants.TYPE_NULL:
-          return new TextBuffer("null");
-        case CodeConstants.TYPE_OBJECT:
-          if (constType.equals(VarType.VARTYPE_STRING)) {
-            return new TextBuffer(convertStringToJava(value.toString(), ascii)).enclose("\"", "\"");
-          }
-          else if (constType.equals(VarType.VARTYPE_CLASS)) {
-            String strval = value.toString();
+        }
+        else if (Float.isNaN(floatVal)) {
+          return new TextBuffer("0.0F / 0.0");
+        }
+        else if (floatVal == Float.POSITIVE_INFINITY) {
+          return new TextBuffer("1.0F / 0.0");
+        }
+        else if (floatVal == Float.NEGATIVE_INFINITY) {
+          return new TextBuffer("-1.0F / 0.0");
+        }
+        return new TextBuffer(value.toString()).append('F');
 
-            VarType classtype;
-            if (strval.startsWith("[")) { // array of simple type
-              classtype = new VarType(strval, false);
-            }
-            else { // class
-              classtype = new VarType(strval, true);
-            }
-
-            return new TextBuffer(ExprProcessor.getCastTypeName(classtype)).append(".class");
+      case CodeConstants.TYPE_DOUBLE:
+        double doubleVal = (Double)value;
+        if (!literal) {
+          if (Double.isNaN(doubleVal)) {
+            return new FieldExprent("NaN", "java/lang/Double", true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
           }
-      }
+          else if (doubleVal == Double.POSITIVE_INFINITY) {
+            return new FieldExprent("POSITIVE_INFINITY", "java/lang/Double", true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
+          }
+          else if (doubleVal == Double.NEGATIVE_INFINITY) {
+            return new FieldExprent("NEGATIVE_INFINITY", "java/lang/Double", true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
+          }
+          else if (doubleVal == Double.MAX_VALUE) {
+            return new FieldExprent("MAX_VALUE", "java/lang/Double", true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
+          }
+          else if (doubleVal == Double.MIN_VALUE) {
+            return new FieldExprent("MIN_VALUE", "java/lang/Double", true, null, FieldDescriptor.DOUBLE_DESCRIPTOR, bytecode).toJava(0, tracer);
+          }
+        }
+        else if (Double.isNaN(doubleVal)) {
+          return new TextBuffer("0.0D / 0.0");
+        }
+        else if (doubleVal == Double.POSITIVE_INFINITY) {
+          return new TextBuffer("1.0D / 0.0");
+        }
+        else if (doubleVal == Double.NEGATIVE_INFINITY) {
+          return new TextBuffer("-1.0D / 0.0");
+        }
+        return new TextBuffer(value.toString()).append('D');
+
+      case CodeConstants.TYPE_NULL:
+        return new TextBuffer("null");
+
+      case CodeConstants.TYPE_OBJECT:
+        if (constType.equals(VarType.VARTYPE_STRING)) {
+          return new TextBuffer(convertStringToJava(value.toString(), ascii)).enclose("\"", "\"");
+        }
+        else if (constType.equals(VarType.VARTYPE_CLASS)) {
+          String stringVal = value.toString();
+          VarType type = new VarType(stringVal, !stringVal.startsWith("["));
+          return new TextBuffer(ExprProcessor.getCastTypeName(type)).append(".class");
+        }
     }
 
-    throw new RuntimeException("invalid constant type");
+    throw new RuntimeException("invalid constant type: " + constType);
+  }
+
+  public boolean isNull() {
+    return CodeConstants.TYPE_NULL == constType.type;
   }
 
   private static String convertStringToJava(String value, boolean ascii) {
@@ -303,15 +265,15 @@ public class ConstExprent extends Exprent {
         case 0x22: //"\\\\\""); // u0022: double quote "
           buffer.append("\\\"");
           break;
-        case 0x27: //"\\\\'");  // u0027: single quote '
-          buffer.append("\\\'");
-          break;
+        //case 0x27: //"\\\\'");  // u0027: single quote '
+        //  buffer.append("\\\'");
+        //  break;
         default:
-          if (c >= 32 && c < 127 || !ascii && TextUtil.isPrintableUnicode(c)) {
+          if (isPrintableAscii(c) || !ascii && TextUtil.isPrintableUnicode(c)) {
             buffer.append(c);
           }
           else {
-            buffer.append(InterpreterUtil.charToUnicodeLiteral(c));
+            buffer.append(TextUtil.charToUnicodeLiteral(c));
           }
       }
     }
@@ -322,13 +284,20 @@ public class ConstExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof ConstExprent)) return false;
+    if (!(o instanceof ConstExprent)) return false;
 
     ConstExprent cn = (ConstExprent)o;
     return InterpreterUtil.equalObjects(constType, cn.getConstType()) &&
            InterpreterUtil.equalObjects(value, cn.getValue());
   }
 
+  @Override
+  public int hashCode() {
+    int result = constType != null ? constType.hashCode() : 0;
+    result = 31 * result + (value != null ? value.hashCode() : 0);
+    return result;
+  }
+
   public boolean hasBooleanValue() {
     switch (constType.type) {
       case CodeConstants.TYPE_BOOLEAN:
@@ -338,9 +307,8 @@ public class ConstExprent extends Exprent {
       case CodeConstants.TYPE_SHORT:
       case CodeConstants.TYPE_SHORTCHAR:
       case CodeConstants.TYPE_INT:
-        Integer ival = (Integer)value;
-        return ival.intValue() == 0 ||
-               (DecompilerContext.getOption(IFernflowerPreferences.BOOLEAN_TRUE_ONE) && ival.intValue() == 1);
+        int value = (Integer)this.value;
+        return value == 0 || (DecompilerContext.getOption(IFernflowerPreferences.BOOLEAN_TRUE_ONE) && value == 1);
     }
 
     return false;
@@ -355,7 +323,7 @@ public class ConstExprent extends Exprent {
       case CodeConstants.TYPE_SHORT:
       case CodeConstants.TYPE_SHORTCHAR:
       case CodeConstants.TYPE_INT:
-        return ((Integer)value).intValue() == 1;
+        return (Integer)value == 1;
       case CodeConstants.TYPE_LONG:
         return ((Long)value).intValue() == 1;
       case CodeConstants.TYPE_DOUBLE:
@@ -370,16 +338,16 @@ public class ConstExprent extends Exprent {
   public static ConstExprent getZeroConstant(int type) {
     switch (type) {
       case CodeConstants.TYPE_INT:
-        return new ConstExprent(VarType.VARTYPE_INT, new Integer(0), null);
+        return new ConstExprent(VarType.VARTYPE_INT, 0, null);
       case CodeConstants.TYPE_LONG:
-        return new ConstExprent(VarType.VARTYPE_LONG, new Long(0), null);
+        return new ConstExprent(VarType.VARTYPE_LONG, 0L, null);
       case CodeConstants.TYPE_DOUBLE:
-        return new ConstExprent(VarType.VARTYPE_DOUBLE, new Double(0), null);
+        return new ConstExprent(VarType.VARTYPE_DOUBLE, 0d, null);
       case CodeConstants.TYPE_FLOAT:
-        return new ConstExprent(VarType.VARTYPE_FLOAT, new Float(0), null);
+        return new ConstExprent(VarType.VARTYPE_FLOAT, 0f, null);
     }
 
-    throw new RuntimeException("Invalid argument!");
+    throw new RuntimeException("Invalid argument: " + type);
   }
 
   public VarType getConstType() {
@@ -392,16 +360,16 @@ public class ConstExprent extends Exprent {
 
   public void adjustConstType(VarType expectedType) {
     // BYTECHAR and SHORTCHAR => CHAR in the CHAR context
-    if (expectedType.equals(VarType.VARTYPE_CHAR) &&
+    if ((expectedType.equals(VarType.VARTYPE_CHAR) || expectedType.equals(VarType.VARTYPE_CHARACTER)) &&
             (constType.equals(VarType.VARTYPE_BYTECHAR) || constType.equals(VarType.VARTYPE_SHORTCHAR))) {
       int intValue = getIntValue();
       if (isPrintableAscii(intValue) || CHAR_ESCAPES.containsKey(intValue)) {
         setConstType(VarType.VARTYPE_CHAR);
       }
     }
-    // CHAR => INT in the INT context
-    else if (expectedType.equals(VarType.VARTYPE_INT) &&
-            constType.equals(VarType.VARTYPE_CHAR)) {
+    // BYTE, BYTECHAR, SHORTCHAR, SHORT, CHAR => INT in the INT context
+    else if ((expectedType.equals(VarType.VARTYPE_INT) || expectedType.equals(VarType.VARTYPE_INTEGER)) &&
+            constType.typeFamily == CodeConstants.TYPE_FAMILY_INTEGER) {
       setConstType(VarType.VARTYPE_INT);
     }
   }
@@ -416,43 +384,39 @@ public class ConstExprent extends Exprent {
   }
 
   public int getIntValue() {
-    return ((Integer)value).intValue();
+    return (Integer)value;
   }
 
   public boolean isBoolPermitted() {
     return boolPermitted;
   }
-  
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
-  public boolean match(MatchNode matchNode, MatchEngine engine) {
 
-    if(!super.match(matchNode, engine)) {
+  @Override
+  public boolean match(MatchNode matchNode, MatchEngine engine) {
+    if (!super.match(matchNode, engine)) {
       return false;
     }
-    
-    for(Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
-      RuleValue rule_value = rule.getValue();
-      
-      switch(rule.getKey()) {
-      case EXPRENT_CONSTTYPE:
-        if(!rule_value.value.equals(this.constType)) {
+
+    for (Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
+      RuleValue value = rule.getValue();
+      MatchProperties key = rule.getKey();
+
+      if (key == MatchProperties.EXPRENT_CONSTTYPE) {
+        if (!value.value.equals(this.constType)) {
+          return false;
+        }
+      }
+      else if (key == MatchProperties.EXPRENT_CONSTVALUE) {
+        if (value.isVariable() && !engine.checkAndSetVariableValue(value.value.toString(), this.value)) {
           return false;
         }
-        break;
-      case EXPRENT_CONSTVALUE:
-        if(rule_value.isVariable()) {
-          if(!engine.checkAndSetVariableValue(rule_value.value.toString(), this.value)) {
-            return false;
-          }
-        } 
-        break;
       }
     }
-    
+
     return true;
   }
-  
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
index 7b4a5ac..b3cc07d 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
@@ -1,34 +1,20 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
 import org.jetbrains.java.decompiler.struct.attr.StructExceptionsAttribute;
+import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
-import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -71,7 +57,7 @@ public class ExitExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     if (value != null) {
       lst.add(value);
     }
@@ -83,21 +69,21 @@ public class ExitExprent extends Exprent {
     tracer.addMapping(bytecode);
 
     if (exitType == EXIT_RETURN) {
-      TextBuffer buffer = new TextBuffer();
+      TextBuffer buffer = new TextBuffer("return");
 
       if (retType.type != CodeConstants.TYPE_VOID) {
-        buffer.append(" ");
+        buffer.append(' ');
         ExprProcessor.getCastedExprent(value, retType, buffer, indent, false, tracer);
       }
 
-      return buffer.prepend("return");
+      return buffer;
     }
     else {
       MethodWrapper method = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
       ClassNode node = ((ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE));
 
       if (method != null && node != null) {
-        StructExceptionsAttribute attr = (StructExceptionsAttribute)method.methodStruct.getAttributes().getWithKey("Exceptions");
+        StructExceptionsAttribute attr = method.methodStruct.getAttribute(StructGeneralAttribute.ATTRIBUTE_EXCEPTIONS);
 
         if (attr != null) {
           String classname = null;
@@ -115,9 +101,9 @@ public class ExitExprent extends Exprent {
 
           if (classname != null) {
             VarType exType = new VarType(classname, true);
-            TextBuffer buffer = new TextBuffer();
+            TextBuffer buffer = new TextBuffer("throw ");
             ExprProcessor.getCastedExprent(value, exType, buffer, indent, false, tracer);
-            return buffer.prepend("throw ");
+            return buffer;
           }
         }
       }
@@ -136,7 +122,7 @@ public class ExitExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof ExitExprent)) return false;
+    if (!(o instanceof ExitExprent)) return false;
 
     ExitExprent et = (ExitExprent)o;
     return exitType == et.getExitType() &&
@@ -154,25 +140,18 @@ public class ExitExprent extends Exprent {
   public VarType getRetType() {
     return retType;
   }
-  
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
-  public boolean match(MatchNode matchNode, MatchEngine engine) {
 
-    if(!super.match(matchNode, engine)) {
+  @Override
+  public boolean match(MatchNode matchNode, MatchEngine engine) {
+    if (!super.match(matchNode, engine)) {
       return false;
     }
-    
+
     Integer type = (Integer)matchNode.getRuleValue(MatchProperties.EXPRENT_EXITTYPE);
-    if(type != null) {
-      if(this.exitType != type.intValue()) {
-        return false;
-      }
-    }
-    
-    return true;
+    return type == null || this.exitType == type;
   }
-  
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
new file mode 100644
index 0000000..302d62f
--- /dev/null
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExprUtil.java
@@ -0,0 +1,45 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.java.decompiler.modules.decompiler.exps;
+
+import org.jetbrains.java.decompiler.code.CodeConstants;
+import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
+import org.jetbrains.java.decompiler.main.DecompilerContext;
+import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
+import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class ExprUtil {
+  public static List<VarVersionPair> getSyntheticParametersMask(String className, String descriptor, int parameters) {
+    ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(className);
+    return node != null ? getSyntheticParametersMask(node, descriptor, parameters) : null;
+  }
+
+  public static List<VarVersionPair> getSyntheticParametersMask(ClassNode node, String descriptor, int parameters) {
+    List<VarVersionPair> mask = null;
+
+    ClassWrapper wrapper = node.getWrapper();
+    if (wrapper != null) {
+      // own class
+      MethodWrapper methodWrapper = wrapper.getMethodWrapper(CodeConstants.INIT_NAME, descriptor);
+      if (methodWrapper == null) {
+        if (DecompilerContext.getOption(IFernflowerPreferences.IGNORE_INVALID_BYTECODE)) {
+          return null;
+        }
+        throw new RuntimeException("Constructor " + node.classStruct.qualifiedName + "." + CodeConstants.INIT_NAME + descriptor + " not found");
+      }
+      mask = methodWrapper.synthParameters;
+    }
+    else if (parameters > 0 && node.type == ClassNode.CLASS_MEMBER && (node.access & CodeConstants.ACC_STATIC) == 0) {
+      // non-static member class
+      mask = new ArrayList<>(Collections.nCopies(parameters, null));
+      mask.set(0, new VarVersionPair(-1, 0));
+    }
+
+    return mask;
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
index fbd146e..bb303e8 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
@@ -1,29 +1,10 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
@@ -34,8 +15,13 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 
-public class Exprent implements IMatchable {
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
 
+public class Exprent implements IMatchable {
   public static final int MULTIPLE_USES = 1;
   public static final int SIDE_EFFECTS_FREE = 2;
   public static final int BOTH_FLAGS = 3;
@@ -61,7 +47,7 @@ public class Exprent implements IMatchable {
 
   public Exprent(int type) {
     this.type = type;
-    this.id = DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.EXPRENT_COUNTER);
+    this.id = DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.EXPRESSION_COUNTER);
   }
 
   public int getPrecedence() {
@@ -77,19 +63,19 @@ public class Exprent implements IMatchable {
   }
 
   public CheckTypesResult checkExprTypeBounds() {
-    return new CheckTypesResult();
+    return null;
   }
 
   public boolean containsExprent(Exprent exprent) {
-    List<Exprent> listTemp = new ArrayList<Exprent>(getAllExprents(true));
-    listTemp.add(this);
-
-    for (Exprent lstExpr : listTemp) {
-      if (lstExpr.equals(exprent)) {
+    if (equals(exprent)) {
+      return true;
+    }
+    List<Exprent> lst = getAllExprents();
+    for (int i = lst.size() - 1; i >= 0; i--) {
+      if (lst.get(i).containsExprent(exprent)) {
         return true;
       }
     }
-
     return false;
   }
 
@@ -107,7 +93,7 @@ public class Exprent implements IMatchable {
     List<Exprent> lstAllExprents = getAllExprents(true);
     lstAllExprents.add(this);
 
-    Set<VarVersionPair> set = new HashSet<VarVersionPair>();
+    Set<VarVersionPair> set = new HashSet<>();
     for (Exprent expr : lstAllExprents) {
       if (expr.type == EXPRENT_VAR) {
         set.add(new VarVersionPair((VarExprent)expr));
@@ -133,65 +119,63 @@ public class Exprent implements IMatchable {
   public void addBytecodeOffsets(Collection<Integer> bytecodeOffsets) {
     if (bytecodeOffsets != null && !bytecodeOffsets.isEmpty()) {
       if (bytecode == null) {
-        bytecode = new HashSet<Integer>(bytecodeOffsets);
+        bytecode = new HashSet<>(bytecodeOffsets);
       }
       else {
         bytecode.addAll(bytecodeOffsets);
       }
     }
   }
-  
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
+
+  @Override
   public IMatchable findObject(MatchNode matchNode, int index) {
-    
-    if(matchNode.getType() != MatchNode.MATCHNODE_EXPRENT) {
+    if (matchNode.getType() != MatchNode.MATCHNODE_EXPRENT) {
       return null;
     }
 
     List<Exprent> lstAllExprents = getAllExprents();
-    
-    if(lstAllExprents == null || lstAllExprents.isEmpty()) {
+    if (lstAllExprents == null || lstAllExprents.isEmpty()) {
       return null;
     }
-    
+
     String position = (String)matchNode.getRuleValue(MatchProperties.EXPRENT_POSITION);
-    if(position != null) {
-      if(position.matches("-?\\d+")) {
+    if (position != null) {
+      if (position.matches("-?\\d+")) {
         return lstAllExprents.get((lstAllExprents.size() + Integer.parseInt(position)) % lstAllExprents.size()); // care for negative positions
       }
-    } else if(index < lstAllExprents.size()) { // use 'index' parameter
+    }
+    else if (index < lstAllExprents.size()) { // use 'index' parameter
       return lstAllExprents.get(index);
     }
 
     return null;
   }
 
+  @Override
   public boolean match(MatchNode matchNode, MatchEngine engine) {
-    
-    if(matchNode.getType() != MatchNode.MATCHNODE_EXPRENT) {
+    if (matchNode.getType() != MatchNode.MATCHNODE_EXPRENT) {
       return false;
     }
-    
-    for(Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
-      switch(rule.getKey()) {
-      case EXPRENT_TYPE:
-        if(this.type != ((Integer)rule.getValue().value).intValue()) {
-          return false;
-        }
-        break;
-      case EXPRENT_RET:
-        if(!engine.checkAndSetVariableValue((String)rule.getValue().value, this)) {
-          return false;
-        }
-        break;
+
+    for (Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
+      MatchProperties key = rule.getKey();
+      if (key == MatchProperties.EXPRENT_TYPE && this.type != (Integer)rule.getValue().value) {
+        return false;
+      }
+      if (key == MatchProperties.EXPRENT_RET && !engine.checkAndSetVariableValue((String)rule.getValue().value, this)) {
+        return false;
       }
-      
     }
-    
+
     return true;
   }
-  
-}
+
+  @Override
+  public String toString() {
+    return toJava(0, BytecodeMappingTracer.DUMMY).toString();
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
index 4ac8123..642a86b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
@@ -1,36 +1,24 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
 import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
 import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
-import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.ArrayList;
@@ -38,7 +26,6 @@ import java.util.List;
 import java.util.Set;
 
 public class FieldExprent extends Exprent {
-
   private final String name;
   private final String classname;
   private final boolean isStatic;
@@ -67,12 +54,12 @@ public class FieldExprent extends Exprent {
 
   @Override
   public int getExprentUse() {
-    return instance == null ? Exprent.MULTIPLE_USES : instance.getExprentUse() & Exprent.MULTIPLE_USES;
+    return 0; // multiple references to a field considered dangerous in a multithreaded environment, thus no Exprent.MULTIPLE_USES set here
   }
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     if (instance != null) {
       lst.add(instance);
     }
@@ -84,14 +71,26 @@ public class FieldExprent extends Exprent {
     return new FieldExprent(name, classname, isStatic, instance == null ? null : instance.copy(), descriptor, bytecode);
   }
 
+  private boolean isAmbiguous() {
+    MethodWrapper method = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
+    if (method != null) {
+      StructLocalVariableTableAttribute attr = method.methodStruct.getLocalVariableAttr();
+      if (attr != null) {
+        return attr.containsName(name);
+      }
+    }
+
+    return false;
+  }
+
   @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     TextBuffer buf = new TextBuffer();
 
     if (isStatic) {
       ClassNode node = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE);
-      if (node == null || !classname.equals(node.classStruct.qualifiedName)) {
-        buf.append(DecompilerContext.getImportCollector().getShortName(ExprProcessor.buildJavaClassName(classname)));
+      if (node == null || !classname.equals(node.classStruct.qualifiedName) || isAmbiguous()) {
+        buf.append(DecompilerContext.getImportCollector().getShortNameInClassContext(ExprProcessor.buildJavaClassName(classname)));
         buf.append(".");
       }
     }
@@ -156,7 +155,7 @@ public class FieldExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof FieldExprent)) return false;
+    if (!(o instanceof FieldExprent)) return false;
 
     FieldExprent ft = (FieldExprent)o;
     return InterpreterUtil.equalObjects(name, ft.getName()) &&
@@ -185,31 +184,27 @@ public class FieldExprent extends Exprent {
   public String getName() {
     return name;
   }
-  
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
-  public boolean match(MatchNode matchNode, MatchEngine engine) {
 
-    if(!super.match(matchNode, engine)) {
+  @Override
+  public boolean match(MatchNode matchNode, MatchEngine engine) {
+    if (!super.match(matchNode, engine)) {
       return false;
     }
-    
+
     RuleValue rule = matchNode.getRules().get(MatchProperties.EXPRENT_FIELD_NAME);
-    if(rule != null) {
-      if(rule.isVariable()) {
-        if(!engine.checkAndSetVariableValue((String)rule.value, this.name)) {
-          return false;
-        }
-      } else { 
-        if(!rule.value.equals(this.name)) {
-          return false;
-        }
+    if (rule != null) {
+      if (rule.isVariable()) {
+        return engine.checkAndSetVariableValue((String)rule.value, this.name);
+      }
+      else {
+        return rule.value.equals(this.name);
       }
     }
-    
+
     return true;
   }
-  
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
index b8f212d..7c78c8f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
@@ -1,22 +1,9 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
@@ -25,6 +12,7 @@ import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.jetbrains.java.decompiler.util.ListStack;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.*;
 
@@ -191,7 +179,7 @@ public class FunctionExprent extends Exprent {
     3    // FUNCTION_STR_CONCAT = 49;
   };
 
-  private static final Set<Integer> ASSOCIATIVITY = new HashSet<Integer>(Arrays.asList(
+  private static final Set<Integer> ASSOCIATIVITY = new HashSet<>(Arrays.asList(
     FUNCTION_ADD, FUNCTION_MUL, FUNCTION_AND, FUNCTION_OR, FUNCTION_XOR, FUNCTION_CADD, FUNCTION_COR, FUNCTION_STR_CONCAT));
 
   private int funcType;
@@ -199,7 +187,7 @@ public class FunctionExprent extends Exprent {
   private final List<Exprent> lstOperands;
 
   public FunctionExprent(int funcType, ListStack<Exprent> stack, Set<Integer> bytecodeOffsets) {
-    this(funcType, new ArrayList<Exprent>(), bytecodeOffsets);
+    this(funcType, new ArrayList<>(), bytecodeOffsets);
 
     if (funcType >= FUNCTION_BIT_NOT && funcType <= FUNCTION_PPI && funcType != FUNCTION_CAST && funcType != FUNCTION_INSTANCEOF) {
       lstOperands.add(stack.pop());
@@ -223,7 +211,7 @@ public class FunctionExprent extends Exprent {
   }
 
   public FunctionExprent(int funcType, Exprent operand, Set<Integer> bytecodeOffsets) {
-    this(funcType, new ArrayList<Exprent>(1), bytecodeOffsets);
+    this(funcType, new ArrayList<>(1), bytecodeOffsets);
     lstOperands.add(operand);
   }
 
@@ -231,9 +219,7 @@ public class FunctionExprent extends Exprent {
   public VarType getExprType() {
     VarType exprType = null;
 
-    if (funcType <= FUNCTION_NEG || funcType == FUNCTION_IPP || funcType == FUNCTION_PPI
-        || funcType == FUNCTION_IMM || funcType == FUNCTION_MMI) {
-
+    if (funcType <= FUNCTION_NEG || funcType == FUNCTION_IPP || funcType == FUNCTION_PPI || funcType == FUNCTION_IMM || funcType == FUNCTION_MMI) {
       VarType type1 = lstOperands.get(0).getExprType();
       VarType type2 = null;
       if (lstOperands.size() > 1) {
@@ -282,7 +268,6 @@ public class FunctionExprent extends Exprent {
       Exprent param1 = lstOperands.get(1);
       Exprent param2 = lstOperands.get(2);
       VarType supertype = VarType.getCommonSupertype(param1.getExprType(), param2.getExprType());
-
       if (param1.type == Exprent.EXPRENT_CONST && param2.type == Exprent.EXPRENT_CONST &&
           supertype.type != CodeConstants.TYPE_BOOLEAN && VarType.VARTYPE_INT.isSuperset(supertype)) {
         exprType = VarType.VARTYPE_INT;
@@ -338,9 +323,6 @@ public class FunctionExprent extends Exprent {
     switch (funcType) {
       case FUNCTION_IIF:
         VarType supertype = getExprType();
-        if (supertype == null) {
-          supertype = getExprType();
-        }
         result.addMinTypeExprent(param1, VarType.VARTYPE_BOOLEAN);
         result.addMinTypeExprent(param2, VarType.getMinTypeInFamily(supertype.typeFamily));
         result.addMinTypeExprent(lstOperands.get(2), VarType.getMinTypeInFamily(supertype.typeFamily));
@@ -413,14 +395,12 @@ public class FunctionExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
-    lst.addAll(lstOperands);
-    return lst;
+    return new ArrayList<>(lstOperands);
   }
 
   @Override
   public Exprent copy() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     for (Exprent expr : lstOperands) {
       lst.add(expr.copy());
     }
@@ -433,7 +413,7 @@ public class FunctionExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof FunctionExprent)) return false;
+    if (!(o instanceof FunctionExprent)) return false;
 
     FunctionExprent fe = (FunctionExprent)o;
     return funcType == fe.getFuncType() &&
@@ -518,10 +498,10 @@ public class FunctionExprent extends Exprent {
         }
 
         return wrapOperandString(lstOperands.get(0), true, indent, tracer)
-                .append("?")
-                .append(wrapOperandString(left, true, indent, tracer))
-                .append(":")
-                .append(wrapOperandString(right, true, indent, tracer));
+          .append(" ? ")
+          .append(wrapOperandString(left, true, indent, tracer))
+          .append(" : ")
+          .append(wrapOperandString(right, true, indent, tracer));
       case FUNCTION_IPP:
         return wrapOperandString(lstOperands.get(0), true, indent, tracer).append("++");
       case FUNCTION_PPI:
@@ -534,27 +514,27 @@ public class FunctionExprent extends Exprent {
         return wrapOperandString(lstOperands.get(0), true, indent, tracer).append(" instanceof ").append(wrapOperandString(lstOperands.get(1), true, indent, tracer));
       case FUNCTION_LCMP: // shouldn't appear in the final code
         return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__lcmp__(")
-                 .append(",")
+                 .append(", ")
                  .append(wrapOperandString(lstOperands.get(1), true, indent, tracer))
                  .append(")");
       case FUNCTION_FCMPL: // shouldn't appear in the final code
         return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__fcmpl__(")
-                 .append(",")
+                 .append(", ")
                  .append(wrapOperandString(lstOperands.get(1), true, indent, tracer))
                  .append(")");
       case FUNCTION_FCMPG: // shouldn't appear in the final code
         return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__fcmpg__(")
-                 .append(",")
+                 .append(", ")
                  .append(wrapOperandString(lstOperands.get(1), true, indent, tracer))
                  .append(")");
       case FUNCTION_DCMPL: // shouldn't appear in the final code
         return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__dcmpl__(")
-                 .append(",")
+                 .append(", ")
                  .append(wrapOperandString(lstOperands.get(1), true, indent, tracer))
                  .append(")");
       case FUNCTION_DCMPG: // shouldn't appear in the final code
         return wrapOperandString(lstOperands.get(0), true, indent, tracer).prepend("__dcmpg__(")
-                 .append(",")
+                 .append(", ")
                  .append(wrapOperandString(lstOperands.get(1), true, indent, tracer))
                  .append(")");
     }
@@ -606,12 +586,12 @@ public class FunctionExprent extends Exprent {
   }
 
   private static VarType getMaxVarType(VarType[] arr) {
-    int[] types = new int[]{CodeConstants.TYPE_DOUBLE, CodeConstants.TYPE_FLOAT, CodeConstants.TYPE_LONG};
-    VarType[] vartypes = new VarType[]{VarType.VARTYPE_DOUBLE, VarType.VARTYPE_FLOAT, VarType.VARTYPE_LONG};
+    int[] types = {CodeConstants.TYPE_DOUBLE, CodeConstants.TYPE_FLOAT, CodeConstants.TYPE_LONG};
+    VarType[] vartypes = {VarType.VARTYPE_DOUBLE, VarType.VARTYPE_FLOAT, VarType.VARTYPE_LONG};
 
     for (int i = 0; i < types.length; i++) {
-      for (int j = 0; j < arr.length; j++) {
-        if (arr[j].type == types[i]) {
+      for (VarType anArr : arr) {
+        if (anArr.type == types[i]) {
           return vartypes[i];
         }
       }
@@ -639,25 +619,18 @@ public class FunctionExprent extends Exprent {
   public void setImplicitType(VarType implicitType) {
     this.implicitType = implicitType;
   }
-  
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
-  public boolean match(MatchNode matchNode, MatchEngine engine) {
 
-    if(!super.match(matchNode, engine)) {
+  @Override
+  public boolean match(MatchNode matchNode, MatchEngine engine) {
+    if (!super.match(matchNode, engine)) {
       return false;
     }
-    
+
     Integer type = (Integer)matchNode.getRuleValue(MatchProperties.EXPRENT_FUNCTYPE);
-    if(type != null) {
-      if(this.funcType != type.intValue()) {
-        return false;
-      }
-    }
-    
-    return true;
+    return type == null || this.funcType == type;
   }
-  
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
index 059270f..32dd0ba 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
@@ -1,27 +1,17 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.jetbrains.java.decompiler.util.ListStack;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 
 public class IfExprent extends Exprent {
 
@@ -44,10 +34,9 @@ public class IfExprent extends Exprent {
   public static final int IF_ACMPEQ = 14;
   public static final int IF_ACMPNE = 15;
 
-  public static final int IF_CAND = 16;
-  public static final int IF_COR = 17;
-
-  public static final int IF_NOT = 18;
+  //public static final int IF_CAND = 16;
+  //public static final int IF_COR = 17;
+  //public static final int IF_NOT = 18;
   public static final int IF_VALUE = 19;
 
   private static final int[] FUNC_TYPES = {
@@ -107,7 +96,7 @@ public class IfExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     lst.add(condition);
     return lst;
   }
@@ -115,7 +104,7 @@ public class IfExprent extends Exprent {
   @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     tracer.addMapping(bytecode);
-    return condition.toJava(indent, tracer).enclose("if(", ")");
+    return condition.toJava(indent, tracer).enclose("if (", ")");
   }
 
   @Override
@@ -128,7 +117,7 @@ public class IfExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof IfExprent)) return false;
+    if (!(o instanceof IfExprent)) return false;
 
     IfExprent ie = (IfExprent)o;
     return InterpreterUtil.equalObjects(condition, ie.getCondition());
@@ -146,4 +135,4 @@ public class IfExprent extends Exprent {
   public void setCondition(Exprent condition) {
     this.condition = condition;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
index 294a115..3fe26b3 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
@@ -1,34 +1,13 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+import org.jetbrains.java.decompiler.modules.decompiler.ClasspathHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
@@ -36,6 +15,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructMethod;
 import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
+import org.jetbrains.java.decompiler.struct.consts.PooledConstant;
 import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.struct.match.MatchEngine;
@@ -43,8 +23,13 @@ import org.jetbrains.java.decompiler.struct.match.MatchNode;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.jetbrains.java.decompiler.util.ListStack;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.util.TextUtil;
 
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.Map.Entry;
+
 public class InvocationExprent extends Exprent {
 
   public static final int INVOKE_SPECIAL = 1;
@@ -62,24 +47,30 @@ public class InvocationExprent extends Exprent {
   private String name;
   private String classname;
   private boolean isStatic;
+  private boolean canIgnoreBoxing = true;
   private int functype = TYP_GENERAL;
   private Exprent instance;
   private MethodDescriptor descriptor;
   private String stringDescriptor;
   private String invokeDynamicClassSuffix;
   private int invocationTyp = INVOKE_VIRTUAL;
-  private List<Exprent> lstParameters = new ArrayList<Exprent>();
+  private List<Exprent> lstParameters = new ArrayList<>();
+  private List<PooledConstant> bootstrapArguments;
 
   public InvocationExprent() {
     super(EXPRENT_INVOCATION);
   }
 
-  public InvocationExprent(int opcode, LinkConstant cn, ListStack<Exprent> stack, int dynamicInvocationType, Set<Integer> bytecodeOffsets) {
+  public InvocationExprent(int opcode,
+                           LinkConstant cn,
+                           List<PooledConstant> bootstrapArguments,
+                           ListStack<? extends Exprent> stack,
+                           Set<Integer> bytecodeOffsets) {
     this();
 
     name = cn.elementname;
     classname = cn.classname;
-
+    this.bootstrapArguments = bootstrapArguments;
     switch (opcode) {
       case CodeConstants.opc_invokestatic:
         invocationTyp = INVOKE_STATIC;
@@ -115,6 +106,15 @@ public class InvocationExprent extends Exprent {
     }
 
     if (opcode == CodeConstants.opc_invokedynamic) {
+      int dynamicInvocationType = -1;
+      if (bootstrapArguments != null) {
+        if (bootstrapArguments.size() > 1) { // INVOKEDYNAMIC is used not only for lambdas
+          PooledConstant link = bootstrapArguments.get(1);
+          if (link instanceof LinkConstant) {
+            dynamicInvocationType = ((LinkConstant)link).index1;
+          }
+        }
+      }
       if (dynamicInvocationType == CodeConstants.CONSTANT_MethodHandle_REF_invokeStatic) {
         isStatic = true;
       }
@@ -141,6 +141,7 @@ public class InvocationExprent extends Exprent {
     name = expr.getName();
     classname = expr.getClassname();
     isStatic = expr.isStatic();
+    canIgnoreBoxing = expr.canIgnoreBoxing;
     functype = expr.getFunctype();
     instance = expr.getInstance();
     if (instance != null) {
@@ -150,10 +151,11 @@ public class InvocationExprent extends Exprent {
     invokeDynamicClassSuffix = expr.getInvokeDynamicClassSuffix();
     stringDescriptor = expr.getStringDescriptor();
     descriptor = expr.getDescriptor();
-    lstParameters = new ArrayList<Exprent>(expr.getLstParameters());
+    lstParameters = new ArrayList<>(expr.getLstParameters());
     ExprProcessor.copyEntries(lstParameters);
 
     addBytecodeOffsets(expr.bytecode);
+    bootstrapArguments = expr.getBootstrapArguments();
   }
 
   @Override
@@ -179,7 +181,7 @@ public class InvocationExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     if (instance != null) {
       lst.add(instance);
     }
@@ -202,29 +204,40 @@ public class InvocationExprent extends Exprent {
 
     tracer.addMapping(bytecode);
 
+    if (instance instanceof InvocationExprent) {
+      ((InvocationExprent) instance).markUsingBoxingResult();
+    }
+
     if (isStatic) {
+      if (isBoxingCall() && canIgnoreBoxing) {
+        // process general "boxing" calls, e.g. 'Object[] data = { true }' or 'Byte b = 123'
+        // here 'byte' and 'short' values do not need an explicit narrowing type cast
+        ExprProcessor.getCastedExprent(lstParameters.get(0), descriptor.params[0], buf, indent, false, false, false, false, tracer);
+        return buf;
+      }
+
       ClassNode node = (ClassNode)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS_NODE);
       if (node == null || !classname.equals(node.classStruct.qualifiedName)) {
-        buf.append(DecompilerContext.getImportCollector().getShortName(ExprProcessor.buildJavaClassName(classname)));
+        buf.append(DecompilerContext.getImportCollector().getShortNameInClassContext(ExprProcessor.buildJavaClassName(classname)));
       }
     }
     else {
 
       if (instance != null && instance.type == Exprent.EXPRENT_VAR) {
-        VarExprent instvar = (VarExprent)instance;
-        VarVersionPair varpaar = new VarVersionPair(instvar);
+        VarExprent instVar = (VarExprent)instance;
+        VarVersionPair varPair = new VarVersionPair(instVar);
 
-        VarProcessor vproc = instvar.getProcessor();
-        if (vproc == null) {
-          MethodWrapper current_meth = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
-          if (current_meth != null) {
-            vproc = current_meth.varproc;
+        VarProcessor varProc = instVar.getProcessor();
+        if (varProc == null) {
+          MethodWrapper currentMethod = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
+          if (currentMethod != null) {
+            varProc = currentMethod.varproc;
           }
         }
 
         String this_classname = null;
-        if (vproc != null) {
-          this_classname = vproc.getThisVars().get(varpaar);
+        if (varProc != null) {
+          this_classname = varProc.getThisVars().get(varPair);
         }
 
         if (this_classname != null) {
@@ -232,7 +245,9 @@ public class InvocationExprent extends Exprent {
 
           if (invocationTyp == INVOKE_SPECIAL) {
             if (!classname.equals(this_classname)) { // TODO: direct comparison to the super class?
-              super_qualifier = this_classname;
+              StructClass cl = DecompilerContext.getStructContext().getClass(classname);
+              boolean isInterface = cl != null && cl.hasModifier(CodeConstants.ACC_INTERFACE);
+              super_qualifier = !isInterface ? this_classname : classname;
             }
           }
         }
@@ -245,6 +260,12 @@ public class InvocationExprent extends Exprent {
         else if (instance != null) {
           TextBuffer res = instance.toJava(indent, tracer);
 
+          if (isUnboxingCall()) {
+            // we don't print the unboxing call - no need to bother with the instance wrapping / casting
+            buf.append(res);
+            return buf;
+          }
+
           VarType rightType = instance.getExprType();
           VarType leftType = new VarType(CodeConstants.TYPE_OBJECT, 0, classname);
 
@@ -281,10 +302,11 @@ public class InvocationExprent extends Exprent {
           buf.append("<invokedynamic>");
         }
         buf.append("(");
-
         break;
+
       case TYP_CLINIT:
         throw new RuntimeException("Explicit invocation of " + CodeConstants.CLINIT_NAME);
+
       case TYP_INIT:
         if (super_qualifier != null) {
           buf.append("super(");
@@ -292,60 +314,160 @@ public class InvocationExprent extends Exprent {
         else if (isInstanceThis) {
           buf.append("this(");
         }
+        else if (instance != null) {
+          buf.append(instance.toJava(indent, tracer)).append(".<init>(");
+        }
         else {
           throw new RuntimeException("Unrecognized invocation of " + CodeConstants.INIT_NAME);
         }
     }
 
-    List<VarVersionPair> sigFields = null;
+    List<VarVersionPair> mask = null;
     boolean isEnum = false;
     if (functype == TYP_INIT) {
       ClassNode newNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(classname);
-
-      if (newNode != null) {  // own class
-        if (newNode.getWrapper() != null) {
-          sigFields = newNode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, stringDescriptor).signatureFields;
-        }
-        else {
-          if (newNode.type == ClassNode.CLASS_MEMBER && (newNode.access & CodeConstants.ACC_STATIC) == 0) { // non-static member class
-            sigFields = new ArrayList<VarVersionPair>(Collections.nCopies(lstParameters.size(), (VarVersionPair)null));
-            sigFields.set(0, new VarVersionPair(-1, 0));
-          }
-        }
+      if (newNode != null) {
+        mask = ExprUtil.getSyntheticParametersMask(newNode, stringDescriptor, lstParameters.size());
         isEnum = newNode.classStruct.hasModifier(CodeConstants.ACC_ENUM) && DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_ENUM);
       }
     }
 
     BitSet setAmbiguousParameters = getAmbiguousParameters();
 
+    // omit 'new Type[] {}' for the last parameter of a vararg method call
+    if (lstParameters.size() == descriptor.params.length && isVarArgCall()) {
+      Exprent lastParam = lstParameters.get(lstParameters.size() - 1);
+      if (lastParam.type == EXPRENT_NEW && lastParam.getExprType().arrayDim >= 1) {
+        ((NewExprent) lastParam).setVarArgParam(true);
+      }
+    }
+
     boolean firstParameter = true;
     int start = isEnum ? 2 : 0;
     for (int i = start; i < lstParameters.size(); i++) {
-      if (sigFields == null) {
-        if (!firstParameter) {
-          buf.append(", ");
-        }
-
+      if (mask == null || mask.get(i) == null) {
         TextBuffer buff = new TextBuffer();
         boolean ambiguous = setAmbiguousParameters.get(i);
-        ExprProcessor.getCastedExprent(lstParameters.get(i), descriptor.params[i], buff, indent, true, ambiguous, tracer);
-        buf.append(buff);
+
+        // 'byte' and 'short' literals need an explicit narrowing type cast when used as a parameter
+        ExprProcessor.getCastedExprent(lstParameters.get(i), descriptor.params[i], buff, indent, true, ambiguous, true, true, tracer);
+
+        // the last "new Object[0]" in the vararg call is not printed
+        if (buff.length() > 0) {
+          if (!firstParameter) {
+            buf.append(", ");
+          }
+          buf.append(buff);
+        }
 
         firstParameter = false;
       }
     }
 
-    buf.append(")");
+    buf.append(')');
 
     return buf;
   }
 
+  private boolean isVarArgCall() {
+    StructClass cl = DecompilerContext.getStructContext().getClass(classname);
+    if (cl != null) {
+      StructMethod mt = cl.getMethod(InterpreterUtil.makeUniqueKey(name, stringDescriptor));
+      if (mt != null) {
+        return mt.hasModifier(CodeConstants.ACC_VARARGS);
+      }
+    }
+    else {
+      // TODO: tap into IDEA indices to access libraries methods details
+
+      // try to check the class on the classpath
+      Method mtd = ClasspathHelper.findMethod(classname, name, descriptor);
+      return mtd != null && mtd.isVarArgs();
+    }
+    return false;
+  }
+
+  public boolean isBoxingCall() {
+    if (isStatic && "valueOf".equals(name) && lstParameters.size() == 1) {
+      int paramType = lstParameters.get(0).getExprType().type;
+
+      // special handling for ambiguous types
+      if (lstParameters.get(0).type == Exprent.EXPRENT_CONST) {
+        // 'Integer.valueOf(1)' has '1' type detected as TYPE_BYTECHAR
+        // 'Integer.valueOf(40_000)' has '40_000' type detected as TYPE_CHAR
+        // so we check the type family instead
+        if (lstParameters.get(0).getExprType().typeFamily == CodeConstants.TYPE_FAMILY_INTEGER) {
+          if (classname.equals("java/lang/Integer")) {
+            return true;
+          }
+        }
+
+        if (paramType == CodeConstants.TYPE_BYTECHAR || paramType == CodeConstants.TYPE_SHORTCHAR) {
+          if (classname.equals("java/lang/Character")) {
+            return true;
+          }
+        }
+      }
+
+      return classname.equals(getClassNameForPrimitiveType(paramType));
+    }
+
+    return false;
+  }
+
+  public void markUsingBoxingResult() {
+    canIgnoreBoxing = false;
+  }
+
+  // TODO: move to CodeConstants ???
+  private static String getClassNameForPrimitiveType(int type) {
+    switch (type) {
+      case CodeConstants.TYPE_BOOLEAN:
+        return "java/lang/Boolean";
+      case CodeConstants.TYPE_BYTE:
+      case CodeConstants.TYPE_BYTECHAR:
+        return "java/lang/Byte";
+      case CodeConstants.TYPE_CHAR:
+        return "java/lang/Character";
+      case CodeConstants.TYPE_SHORT:
+      case CodeConstants.TYPE_SHORTCHAR:
+        return "java/lang/Short";
+      case CodeConstants.TYPE_INT:
+        return "java/lang/Integer";
+      case CodeConstants.TYPE_LONG:
+        return "java/lang/Long";
+      case CodeConstants.TYPE_FLOAT:
+        return "java/lang/Float";
+      case CodeConstants.TYPE_DOUBLE:
+        return "java/lang/Double";
+    }
+    return null;
+  }
+
+  private static final Map<String, String> UNBOXING_METHODS;
+
+  static {
+    UNBOXING_METHODS = new HashMap<>();
+    UNBOXING_METHODS.put("booleanValue", "java/lang/Boolean");
+    UNBOXING_METHODS.put("byteValue", "java/lang/Byte");
+    UNBOXING_METHODS.put("shortValue", "java/lang/Short");
+    UNBOXING_METHODS.put("intValue", "java/lang/Integer");
+    UNBOXING_METHODS.put("longValue", "java/lang/Long");
+    UNBOXING_METHODS.put("floatValue", "java/lang/Float");
+    UNBOXING_METHODS.put("doubleValue", "java/lang/Double");
+    UNBOXING_METHODS.put("charValue", "java/lang/Character");
+  }
+
+  private boolean isUnboxingCall() {
+    return !isStatic && lstParameters.size() == 0 && classname.equals(UNBOXING_METHODS.get(name));
+  }
+
   private BitSet getAmbiguousParameters() {
     StructClass cl = DecompilerContext.getStructContext().getClass(classname);
     if (cl == null) return EMPTY_BIT_SET;
 
     // check number of matches
-    List<MethodDescriptor> matches = new ArrayList<MethodDescriptor>();
+    List<MethodDescriptor> matches = new ArrayList<>();
     nextMethod:
     for (StructMethod mt : cl.getMethods()) {
       if (name.equals(mt.getName())) {
@@ -408,7 +530,7 @@ public class InvocationExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof InvocationExprent)) return false;
+    if (!(o instanceof InvocationExprent)) return false;
 
     InvocationExprent it = (InvocationExprent)o;
     return InterpreterUtil.equalObjects(name, it.getName()) &&
@@ -492,46 +614,42 @@ public class InvocationExprent extends Exprent {
     return invokeDynamicClassSuffix;
   }
 
+  public List<PooledConstant> getBootstrapArguments() {
+    return bootstrapArguments;
+  }
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
-  public boolean match(MatchNode matchNode, MatchEngine engine) {
 
-    if(!super.match(matchNode, engine)) {
+  @Override
+  public boolean match(MatchNode matchNode, MatchEngine engine) {
+    if (!super.match(matchNode, engine)) {
       return false;
     }
-    
-    for(Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
+
+    for (Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
       RuleValue value = rule.getValue();
-      
-      switch(rule.getKey()) {
-      case EXPRENT_INVOCATION_PARAMETER:
-        if(value.isVariable()) {
-          if(value.parameter < lstParameters.size()) {
-            if(!engine.checkAndSetVariableValue(value.value.toString(), lstParameters.get(value.parameter))) {
-              return false;
-            }
-          } else {
-            return false;
-          }
-        }
-        break;
-      case EXPRENT_INVOCATION_CLASS:
-        if(!value.value.equals(this.classname)) {
+
+      MatchProperties key = rule.getKey();
+      if (key == MatchProperties.EXPRENT_INVOCATION_PARAMETER) {
+        if (value.isVariable() && (value.parameter >= lstParameters.size() ||
+                                   !engine.checkAndSetVariableValue(value.value.toString(), lstParameters.get(value.parameter)))) {
+          return false;
+        }
+      }
+      else if (key == MatchProperties.EXPRENT_INVOCATION_CLASS) {
+        if (!value.value.equals(this.classname)) {
+          return false;
+        }
+      }
+      else if (key == MatchProperties.EXPRENT_INVOCATION_SIGNATURE) {
+        if (!value.value.equals(this.name + this.stringDescriptor)) {
           return false;
         }
-        break;
-      case EXPRENT_INVOCATION_SIGNATURE:
-        if(!value.value.equals(this.name + this.stringDescriptor)) {
-          return false;
-        }
-        break;
       }
-      
     }
-    
+
     return true;
   }
-
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
index 0ece9aa..4172874 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
@@ -1,23 +1,11 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,7 +34,7 @@ public class MonitorExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     lst.add(value);
     return lst;
   }
@@ -73,7 +61,7 @@ public class MonitorExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof MonitorExprent)) return false;
+    if (!(o instanceof MonitorExprent)) return false;
 
     MonitorExprent me = (MonitorExprent)o;
     return monType == me.getMonType() &&
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
index 5130445..ae6448a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
@@ -1,47 +1,35 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassWriter;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
+import org.jetbrains.java.decompiler.struct.gen.generics.GenericClassDescriptor;
+import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.jetbrains.java.decompiler.util.ListStack;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
 public class NewExprent extends Exprent {
-
   private InvocationExprent constructor;
   private final VarType newType;
-  private List<Exprent> lstDims = new ArrayList<Exprent>();
-  private List<Exprent> lstArrayElements = new ArrayList<Exprent>();
+  private List<Exprent> lstDims = new ArrayList<>();
+  private List<Exprent> lstArrayElements = new ArrayList<>();
   private boolean directArrayInit;
+  private boolean isVarArgParam;
   private boolean anonymous;
   private boolean lambda;
   private boolean enumConst;
@@ -71,7 +59,7 @@ public class NewExprent extends Exprent {
   }
 
   private static List<Exprent> getDimensions(int arrayDim, ListStack<Exprent> stack) {
-    List<Exprent> lstDims = new ArrayList<Exprent>();
+    List<Exprent> lstDims = new ArrayList<>();
     for (int i = 0; i < arrayDim; i++) {
       lstDims.add(0, stack.pop());
     }
@@ -80,12 +68,7 @@ public class NewExprent extends Exprent {
 
   @Override
   public VarType getExprType() {
-    if (anonymous) {
-      return DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.value).anonymousClassType;
-    }
-    else {
-      return newType;
-    }
+    return anonymous ? DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.value).anonymousClassType : newType;
   }
 
   @Override
@@ -106,10 +89,8 @@ public class NewExprent extends Exprent {
         }
       }
     }
-    else {
-      if (constructor != null) {
-        return constructor.checkExprTypeBounds();
-      }
+    else if (constructor != null) {
+      return constructor.checkExprTypeBounds();
     }
 
     return result;
@@ -117,29 +98,26 @@ public class NewExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
-    if (newType.arrayDim == 0) {
-      if (constructor != null) {
-        Exprent constructor_instance = constructor.getInstance();
+    List<Exprent> lst = new ArrayList<>();
 
-        if (constructor_instance != null) { // should be true only for a lambda expression with a virtual content method
-          lst.add(constructor_instance);
-        }
-
-        lst.addAll(constructor.getLstParameters());
-      }
-    }
-    else {
+    if (newType.arrayDim != 0) {
       lst.addAll(lstDims);
       lst.addAll(lstArrayElements);
     }
+    else if (constructor != null) {
+      Exprent constructor = this.constructor.getInstance();
+      if (constructor != null) { // should be true only for a lambda expression with a virtual content method
+        lst.add(constructor);
+      }
+      lst.addAll(this.constructor.getLstParameters());
+    }
 
     return lst;
   }
 
   @Override
   public Exprent copy() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     for (Exprent expr : lstDims) {
       lst.add(expr.copy());
     }
@@ -163,85 +141,76 @@ public class NewExprent extends Exprent {
     TextBuffer buf = new TextBuffer();
 
     if (anonymous) {
-
       ClassNode child = DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.value);
 
-      buf.append("(");
-
-      if (!lambda && constructor != null) {
-
-        InvocationExprent invsuper = child.superInvocation;
-
-        ClassNode newnode = DecompilerContext.getClassProcessor().getMapRootClasses().get(invsuper.getClassname());
-
-        List<VarVersionPair> sigFields = null;
-        if (newnode != null) { // own class
-          if (newnode.getWrapper() != null) {
-            sigFields = newnode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, invsuper.getStringDescriptor()).signatureFields;
-          }
-          else {
-            if (newnode.type == ClassNode.CLASS_MEMBER && (newnode.access & CodeConstants.ACC_STATIC) == 0 &&
-                !constructor.getLstParameters().isEmpty()) { // member non-static class invoked with enclosing class instance
-              sigFields = new ArrayList<VarVersionPair>(Collections.nCopies(constructor.getLstParameters().size(), (VarVersionPair)null));
-              sigFields.set(0, new VarVersionPair(-1, 0));
-            }
-          }
-        }
-
-        boolean firstpar = true;
-        int start = 0, end = invsuper.getLstParameters().size();
-        if (enumConst) {
-          start += 2;
-          end -= 1;
-        }
-        for (int i = start; i < end; i++) {
-          if (sigFields == null || sigFields.get(i) == null) {
-            if (!firstpar) {
-              buf.append(", ");
-            }
-
-            Exprent param = invsuper.getLstParameters().get(i);
-            if (param.type == Exprent.EXPRENT_VAR) {
-              int varindex = ((VarExprent)param).getIndex();
-              if (varindex > 0 && varindex <= constructor.getLstParameters().size()) {
-                param = constructor.getLstParameters().get(varindex - 1);
-              }
-            }
-
-            TextBuffer buff = new TextBuffer();
-            ExprProcessor.getCastedExprent(param, invsuper.getDescriptor().params[i], buff, indent, true, tracer);
-
-            buf.append(buff);
-            firstpar = false;
-          }
-        }
-      }
-
-      if (!enumConst) {
+      // IDEA-204310 - avoid backtracking later on for lambdas (causes spurious imports)
+      if (!enumConst && (!lambda || DecompilerContext.getOption(IFernflowerPreferences.LAMBDA_TO_ANONYMOUS_CLASS))) {
         String enclosing = null;
+
         if (!lambda && constructor != null) {
           enclosing = getQualifiedNewInstance(child.anonymousClassType.value, constructor.getLstParameters(), indent, tracer);
+          if (enclosing != null) {
+            buf.append(enclosing).append('.');
+          }
         }
 
-        String typename = ExprProcessor.getCastTypeName(child.anonymousClassType);
+        buf.append("new ");
 
+        String typename = ExprProcessor.getCastTypeName(child.anonymousClassType);
         if (enclosing != null) {
-          ClassNode anonimousNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(child.anonymousClassType.value);
-          if (anonimousNode != null) {
-            typename = anonimousNode.simpleName;
+          ClassNode anonymousNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(child.anonymousClassType.value);
+          if (anonymousNode != null) {
+            typename = anonymousNode.simpleName;
           }
           else {
             typename = typename.substring(typename.lastIndexOf('.') + 1);
           }
         }
-        buf.prepend("new " + typename);
 
-        if (enclosing != null) {
-          buf.prepend(enclosing + ".");
+        GenericClassDescriptor descriptor = ClassWriter.getGenericClassDescriptor(child.classStruct);
+        if (descriptor != null) {
+          if (descriptor.superinterfaces.isEmpty()) {
+            buf.append(GenericMain.getGenericCastTypeName(descriptor.superclass));
+          }
+          else {
+            if (descriptor.superinterfaces.size() > 1 && !lambda) {
+              DecompilerContext.getLogger().writeMessage("Inconsistent anonymous class signature: " + child.classStruct.qualifiedName,
+                                                         IFernflowerLogger.Severity.WARN);
+            }
+            buf.append(GenericMain.getGenericCastTypeName(descriptor.superinterfaces.get(0)));
+          }
+        }
+        else {
+          buf.append(typename);
         }
       }
 
-      buf.append(")");
+      buf.append('(');
+
+      if (!lambda && constructor != null) {
+        List<Exprent> parameters = constructor.getLstParameters();
+        List<VarVersionPair> mask = child.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, constructor.getStringDescriptor()).synthParameters;
+        if (mask == null) {
+          InvocationExprent superCall = child.superInvocation;
+          mask = ExprUtil.getSyntheticParametersMask(superCall.getClassname(), superCall.getStringDescriptor(), parameters.size());
+        }
+
+        int start = enumConst ? 2 : 0;
+        boolean firstParam = true;
+        for (int i = start; i < parameters.size(); i++) {
+          if (mask == null || mask.get(i) == null) {
+            if (!firstParam) {
+              buf.append(", ");
+            }
+
+            ExprProcessor.getCastedExprent(parameters.get(i), constructor.getDescriptor().params[i], buf, indent, true, tracer);
+
+            firstParam = false;
+          }
+        }
+      }
+
+      buf.append(')');
 
       if (enumConst && buf.length() == 2) {
         buf.setLength(0);
@@ -266,102 +235,104 @@ public class NewExprent extends Exprent {
     }
     else if (directArrayInit) {
       VarType leftType = newType.decreaseArrayDim();
-      buf.append("{");
+      buf.append('{');
       for (int i = 0; i < lstArrayElements.size(); i++) {
         if (i > 0) {
           buf.append(", ");
         }
         ExprProcessor.getCastedExprent(lstArrayElements.get(i), leftType, buf, indent, false, tracer);
       }
-      buf.append("}");
+      buf.append('}');
     }
-    else {
-      if (newType.arrayDim == 0) {
+    else if (newType.arrayDim == 0) {
+      if (!enumConst) {
+        String enclosing = null;
 
         if (constructor != null) {
-
-          List<Exprent> lstParameters = constructor.getLstParameters();
-
-          ClassNode newnode = DecompilerContext.getClassProcessor().getMapRootClasses().get(constructor.getClassname());
-
-          List<VarVersionPair> sigFields = null;
-          if (newnode != null) { // own class
-            if (newnode.getWrapper() != null) {
-              sigFields = newnode.getWrapper().getMethodWrapper(CodeConstants.INIT_NAME, constructor.getStringDescriptor()).signatureFields;
-            }
-            else {
-              if (newnode.type == ClassNode.CLASS_MEMBER && (newnode.access & CodeConstants.ACC_STATIC) == 0 &&
-                  !constructor.getLstParameters().isEmpty()) { // member non-static class invoked with enclosing class instance
-                sigFields = new ArrayList<VarVersionPair>(Collections.nCopies(lstParameters.size(), (VarVersionPair)null));
-                sigFields.set(0, new VarVersionPair(-1, 0));
-              }
-            }
-          }
-
-          int start = enumConst ? 2 : 0;
-          if (!enumConst || start < lstParameters.size()) {
-            buf.append("(");
-
-            boolean firstParam = true;
-            for (int i = start; i < lstParameters.size(); i++) {
-              if (sigFields == null || sigFields.get(i) == null) {
-                Exprent expr = lstParameters.get(i);
-                VarType leftType = constructor.getDescriptor().params[i];
-
-                if (i == lstParameters.size() - 1 && expr.getExprType() == VarType.VARTYPE_NULL) {
-                  ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(leftType.value);
-                  if (node != null && node.namelessConstructorStub) {
-                    break;  // skip last parameter of synthetic constructor call
-                  }
-                }
-
-                if (!firstParam) {
-                  buf.append(", ");
-                }
-
-                TextBuffer buff = new TextBuffer();
-                ExprProcessor.getCastedExprent(expr, leftType, buff, indent, true, tracer);
-                buf.append(buff);
-
-                firstParam = false;
-              }
-            }
-
-            buf.append(")");
+          enclosing = getQualifiedNewInstance(newType.value, constructor.getLstParameters(), indent, tracer);
+          if (enclosing != null) {
+            buf.append(enclosing).append('.');
           }
         }
 
-        if (!enumConst) {
-          String enclosing = null;
-          if (constructor != null) {
-            enclosing = getQualifiedNewInstance(newType.value, constructor.getLstParameters(), indent, tracer);
+        buf.append("new ");
+
+        String typename = ExprProcessor.getTypeName(newType);
+        if (enclosing != null) {
+          ClassNode newNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.value);
+          if (newNode != null) {
+            typename = newNode.simpleName;
           }
+          else {
+            typename = typename.substring(typename.lastIndexOf('.') + 1);
+          }
+        }
+        buf.append(typename);
+      }
 
-          String typename = ExprProcessor.getTypeName(newType);
+      if (constructor != null) {
+        List<Exprent> parameters = constructor.getLstParameters();
+        List<VarVersionPair> mask = ExprUtil.getSyntheticParametersMask(constructor.getClassname(), constructor.getStringDescriptor(), parameters.size());
 
-          if (enclosing != null) {
-            ClassNode newNode = DecompilerContext.getClassProcessor().getMapRootClasses().get(newType.value);
-            if (newNode != null) {
-              typename = newNode.simpleName;
-            }
-            else {
-              typename = typename.substring(typename.lastIndexOf('.') + 1);
+        int start = enumConst ? 2 : 0;
+        if (!enumConst || start < parameters.size()) {
+          buf.append('(');
+
+          boolean firstParam = true;
+          for (int i = start; i < parameters.size(); i++) {
+            if (mask == null || mask.get(i) == null) {
+              Exprent expr = parameters.get(i);
+              VarType leftType = constructor.getDescriptor().params[i];
+
+              if (i == parameters.size() - 1 && expr.getExprType() == VarType.VARTYPE_NULL && probablySyntheticParameter(leftType.value)) {
+                break;  // skip last parameter of synthetic constructor call
+              }
+
+              if (!firstParam) {
+                buf.append(", ");
+              }
+
+              ExprProcessor.getCastedExprent(expr, leftType, buf, indent, true, false, true, true, tracer);
+
+              firstParam = false;
             }
           }
-          buf.prepend("new " + typename);
 
-          if (enclosing != null) {
-            buf.prepend(enclosing + ".");
-          }
+          buf.append(')');
         }
       }
-      else {
-        buf.append("new ").append(ExprProcessor.getTypeName(newType));
+    }
+    else if (isVarArgParam) {
+      // just print the array elements
+      VarType leftType = newType.decreaseArrayDim();
+      for (int i = 0; i < lstArrayElements.size(); i++) {
+        if (i > 0) {
+          buf.append(", ");
+        }
 
-        if (lstArrayElements.isEmpty()) {
-          for (int i = 0; i < newType.arrayDim; i++) {
-            buf.append("[");
-            if (i < lstDims.size()) {
+        // new String[][]{{"abc"}, {"DEF"}} => new String[]{"abc"}, new String[]{"DEF"}
+        Exprent element = lstArrayElements.get(i);
+        if (element.type == EXPRENT_NEW) {
+          ((NewExprent) element).setDirectArrayInit(false);
+        }
+        ExprProcessor.getCastedExprent(element, leftType, buf, indent, false, tracer);
+      }
+
+      // if there is just one element of Object[] type it needs to be casted to resolve ambiguity
+      if (lstArrayElements.size() == 1) {
+        VarType elementType = lstArrayElements.get(0).getExprType();
+        if (elementType.type == CodeConstants.TYPE_OBJECT && elementType.value.equals("java/lang/Object") && elementType.arrayDim >= 1) {
+          buf.prepend("(Object)");
+        }
+      }
+    }
+    else {
+      buf.append("new ").append(ExprProcessor.getTypeName(newType));
+
+      if (lstArrayElements.isEmpty()) {
+        for (int i = 0; i < newType.arrayDim; i++) {
+          buf.append('[');
+          if (i < lstDims.size()) {
               Exprent dim = lstDims.get(i);
 
               if (dim.type == Exprent.EXPRENT_CONST) {
@@ -369,33 +340,35 @@ public class NewExprent extends Exprent {
               }
 
               buf.append(dim.toJava(indent, tracer));
-            }
-            buf.append("]");
           }
-        }
-        else {
-          for (int i = 0; i < newType.arrayDim; i++) {
-            buf.append("[]");
-          }
-
-          VarType leftType = newType.decreaseArrayDim();
-          buf.append("{");
-          for (int i = 0; i < lstArrayElements.size(); i++) {
-            if (i > 0) {
-              buf.append(", ");
-            }
-            TextBuffer buff = new TextBuffer();
-            ExprProcessor.getCastedExprent(lstArrayElements.get(i), leftType, buff, indent, false, tracer);
-
-            buf.append(buff);
-          }
-          buf.append("}");
+          buf.append(']');
         }
       }
+      else {
+        for (int i = 0; i < newType.arrayDim; i++) {
+          buf.append("[]");
+        }
+
+        VarType leftType = newType.decreaseArrayDim();
+        buf.append('{');
+        for (int i = 0; i < lstArrayElements.size(); i++) {
+          if (i > 0) {
+            buf.append(", ");
+          }
+          ExprProcessor.getCastedExprent(lstArrayElements.get(i), leftType, buf, indent, false, tracer);
+        }
+        buf.append('}');
+      }
     }
+
     return buf;
   }
 
+  private static boolean probablySyntheticParameter(String className) {
+    ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(className);
+    return node != null && node.type == ClassNode.CLASS_ANONYMOUS;
+  }
+
   private static String getQualifiedNewInstance(String classname, List<Exprent> lstParams, int indent, BytecodeMappingTracer tracer) {
     ClassNode node = DecompilerContext.getClassProcessor().getMapRootClasses().get(classname);
 
@@ -455,7 +428,7 @@ public class NewExprent extends Exprent {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof NewExprent)) return false;
+    if (!(o instanceof NewExprent)) return false;
 
     NewExprent ne = (NewExprent)o;
     return InterpreterUtil.equalObjects(newType, ne.getNewType()) &&
@@ -493,6 +466,10 @@ public class NewExprent extends Exprent {
     this.directArrayInit = directArrayInit;
   }
 
+  public void setVarArgParam(boolean isVarArgParam) {
+    this.isVarArgParam = isVarArgParam;
+  }
+
   public boolean isLambda() {
     return lambda;
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
index fd77112..3a97175 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
@@ -1,25 +1,13 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.CheckTypesResult;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,7 +16,7 @@ import java.util.Set;
 public class SwitchExprent extends Exprent {
 
   private Exprent value;
-  private List<List<ConstExprent>> caseValues = new ArrayList<List<ConstExprent>>();
+  private List<List<Exprent>> caseValues = new ArrayList<>();
 
   public SwitchExprent(Exprent value, Set<Integer> bytecodeOffsets) {
     super(EXPRENT_SWITCH);
@@ -41,9 +29,9 @@ public class SwitchExprent extends Exprent {
   public Exprent copy() {
     SwitchExprent swExpr = new SwitchExprent(value.copy(), bytecode);
 
-    List<List<ConstExprent>> lstCaseValues = new ArrayList<List<ConstExprent>>();
-    for (List<ConstExprent> lst : caseValues) {
-      lstCaseValues.add(new ArrayList<ConstExprent>(lst));
+    List<List<Exprent>> lstCaseValues = new ArrayList<>();
+    for (List<Exprent> lst : caseValues) {
+      lstCaseValues.add(new ArrayList<>(lst));
     }
     swExpr.setCaseValues(lstCaseValues);
 
@@ -63,8 +51,8 @@ public class SwitchExprent extends Exprent {
     result.addMaxTypeExprent(value, VarType.VARTYPE_INT);
 
     VarType valType = value.getExprType();
-    for (List<ConstExprent> lst : caseValues) {
-      for (ConstExprent expr : lst) {
+    for (List<Exprent> lst : caseValues) {
+      for (Exprent expr : lst) {
         if (expr != null) {
           VarType caseType = expr.getExprType();
           if (!caseType.equals(valType)) {
@@ -80,7 +68,7 @@ public class SwitchExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    List<Exprent> lst = new ArrayList<Exprent>();
+    List<Exprent> lst = new ArrayList<>();
     lst.add(value);
     return lst;
   }
@@ -104,7 +92,7 @@ public class SwitchExprent extends Exprent {
       return true;
     }
 
-    if (o == null || !(o instanceof SwitchExprent)) {
+    if (!(o instanceof SwitchExprent)) {
       return false;
     }
 
@@ -116,7 +104,7 @@ public class SwitchExprent extends Exprent {
     return value;
   }
 
-  public void setCaseValues(List<List<ConstExprent>> caseValues) {
+  public void setCaseValues(List<List<Exprent>> caseValues) {
     this.caseValues = caseValues;
   }
 }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/TypeAnnotation.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/TypeAnnotation.java
new file mode 100644
index 0000000..0836731
--- /dev/null
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/TypeAnnotation.java
@@ -0,0 +1,53 @@
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.java.decompiler.modules.decompiler.exps;
+
+public class TypeAnnotation {
+  public static final int CLASS_TYPE_PARAMETER = 0x00;
+  public static final int METHOD_TYPE_PARAMETER = 0x01;
+  public static final int SUPER_TYPE_REFERENCE = 0x10;
+  public static final int CLASS_TYPE_PARAMETER_BOUND = 0x11;
+  public static final int METHOD_TYPE_PARAMETER_BOUND = 0x12;
+  public static final int FIELD = 0x13;
+  public static final int METHOD_RETURN_TYPE = 0x14;
+  public static final int METHOD_RECEIVER = 0x15;
+  public static final int METHOD_PARAMETER = 0x16;
+  public static final int THROWS_REFERENCE = 0x17;
+  public static final int LOCAL_VARIABLE = 0x40;
+  public static final int RESOURCE_VARIABLE = 0x41;
+  public static final int CATCH_CLAUSE = 0x42;
+  public static final int EXPR_INSTANCEOF = 0x43;
+  public static final int EXPR_NEW = 0x44;
+  public static final int EXPR_CONSTRUCTOR_REF = 0x45;
+  public static final int EXPR_METHOD_REF = 0x46;
+  public static final int TYPE_ARG_CAST = 0x47;
+  public static final int TYPE_ARG_CONSTRUCTOR_CALL = 0x48;
+  public static final int TYPE_ARG_METHOD_CALL = 0x49;
+  public static final int TYPE_ARG_CONSTRUCTOR_REF = 0x4A;
+  public static final int TYPE_ARG_METHOD_REF = 0x4B;
+
+  private final int target;
+  private final byte[] path;
+  private final AnnotationExprent annotation;
+
+  public TypeAnnotation(int target, byte[] path, AnnotationExprent annotation) {
+    this.target = target;
+    this.path = path;
+    this.annotation = annotation;
+  }
+
+  public int getTargetType() {
+    return target >> 24;
+  }
+
+  public int getIndex() {
+    return target & 0x0FFFF;
+  }
+
+  public boolean isTopLevel() {
+    return path == null;
+  }
+
+  public AnnotationExprent getAnnotation() {
+    return annotation;
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
index 4436cb5..f30082e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
@@ -1,36 +1,30 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.exps;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassWriter;
 import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarTypeProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+import org.jetbrains.java.decompiler.struct.StructMethod;
+import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
+import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
+import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTypeTableAttribute;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
+import org.jetbrains.java.decompiler.struct.gen.generics.GenericFieldDescriptor;
+import org.jetbrains.java.decompiler.struct.gen.generics.GenericMain;
 import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
-import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,16 +37,22 @@ public class VarExprent extends Exprent {
   private int index;
   private VarType varType;
   private boolean definition = false;
-  private VarProcessor processor;
+  private final VarProcessor processor;
+  private final int visibleOffset;
   private int version = 0;
   private boolean classDef = false;
   private boolean stack = false;
 
   public VarExprent(int index, VarType varType, VarProcessor processor) {
+    this(index, varType, processor, -1);
+  }
+
+  public VarExprent(int index, VarType varType, VarProcessor processor, int visibleOffset) {
     super(EXPRENT_VAR);
     this.index = index;
     this.varType = varType;
     this.processor = processor;
+    this.visibleOffset = visibleOffset;
   }
 
   @Override
@@ -67,12 +67,12 @@ public class VarExprent extends Exprent {
 
   @Override
   public List<Exprent> getAllExprents() {
-    return new ArrayList<Exprent>();
+    return new ArrayList<>();
   }
 
   @Override
   public Exprent copy() {
-    VarExprent var = new VarExprent(index, getVarType(), processor);
+    VarExprent var = new VarExprent(index, getVarType(), processor, visibleOffset);
     var.setDefinition(definition);
     var.setVersion(version);
     var.setClassDef(classDef);
@@ -92,27 +92,89 @@ public class VarExprent extends Exprent {
       tracer.incrementCurrentSourceLine(buffer.countLines());
     }
     else {
+      VarVersionPair varVersion = getVarVersionPair();
       String name = null;
       if (processor != null) {
-        name = processor.getVarName(new VarVersionPair(index, version));
+        name = processor.getVarName(varVersion);
       }
 
       if (definition) {
-        if (processor != null && processor.getVarFinal(new VarVersionPair(index, version)) == VarTypeProcessor.VAR_EXPLICIT_FINAL) {
+        if (processor != null && processor.getVarFinal(varVersion) == VarTypeProcessor.VAR_EXPLICIT_FINAL) {
           buffer.append("final ");
         }
-        buffer.append(ExprProcessor.getCastTypeName(getVarType())).append(" ");
+        appendDefinitionType(buffer);
+        buffer.append(" ");
       }
-      buffer.append(name == null ? ("var" + index + (version == 0 ? "" : "_" + version)) : name);
+
+      buffer.append(name == null ? ("var" + index + (this.version == 0 ? "" : "_" + this.version)) : name);
     }
 
     return buffer;
   }
 
+  public VarVersionPair getVarVersionPair() {
+    return new VarVersionPair(index, version);
+  }
+
+  public String getDebugName(StructMethod method) {
+    StructLocalVariableTableAttribute attr = method.getLocalVariableAttr();
+    if (attr != null && processor != null) {
+      Integer origIndex = processor.getVarOriginalIndex(index);
+      if (origIndex != null) {
+        String name = attr.getName(origIndex, visibleOffset);
+        if (name != null && TextUtil.isValidIdentifier(name, method.getClassStruct().getBytecodeVersion())) {
+          return name;
+        }
+      }
+    }
+    return null;
+  }
+
+  private void appendDefinitionType(TextBuffer buffer) {
+    if (DecompilerContext.getOption(IFernflowerPreferences.USE_DEBUG_VAR_NAMES)) {
+      MethodWrapper method = (MethodWrapper)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_WRAPPER);
+      if (method != null) {
+        Integer originalIndex = null;
+        if (processor != null) {
+          originalIndex = processor.getVarOriginalIndex(index);
+        }
+        if (originalIndex != null) {
+          // first try from signature
+          if (DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES)) {
+            StructLocalVariableTypeTableAttribute attr =
+              method.methodStruct.getAttribute(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE);
+            if (attr != null) {
+              String signature = attr.getSignature(originalIndex, visibleOffset);
+              if (signature != null) {
+                GenericFieldDescriptor descriptor = GenericMain.parseFieldSignature(signature);
+                if (descriptor != null) {
+                  buffer.append(GenericMain.getGenericCastTypeName(descriptor.type));
+                  return;
+                }
+              }
+            }
+          }
+
+          // then try from descriptor
+          StructLocalVariableTableAttribute attr = method.methodStruct.getLocalVariableAttr();
+          if (attr != null) {
+            String descriptor = attr.getDescriptor(originalIndex, visibleOffset);
+            if (descriptor != null) {
+              buffer.append(ExprProcessor.getCastTypeName(new VarType(descriptor)));
+              return;
+            }
+          }
+        }
+      }
+    }
+
+    buffer.append(ExprProcessor.getCastTypeName(getVarType()));
+  }
+
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof VarExprent)) return false;
+    if (!(o instanceof VarExprent)) return false;
 
     VarExprent ve = (VarExprent)o;
     return index == ve.getIndex() &&
@@ -131,7 +193,7 @@ public class VarExprent extends Exprent {
   public VarType getVarType() {
     VarType vt = null;
     if (processor != null) {
-      vt = processor.getVarType(new VarVersionPair(index, version));
+      vt = processor.getVarType(getVarVersionPair());
     }
 
     if (vt == null || (varType != null && varType.type != CodeConstants.TYPE_UNKNOWN)) {
@@ -157,10 +219,6 @@ public class VarExprent extends Exprent {
     return processor;
   }
 
-  public void setProcessor(VarProcessor processor) {
-    this.processor = processor;
-  }
-
   public int getVersion() {
     return version;
   }
@@ -184,31 +242,27 @@ public class VarExprent extends Exprent {
   public void setStack(boolean stack) {
     this.stack = stack;
   }
-  
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
-  public boolean match(MatchNode matchNode, MatchEngine engine) {
 
-    if(!super.match(matchNode, engine)) {
+  @Override
+  public boolean match(MatchNode matchNode, MatchEngine engine) {
+    if (!super.match(matchNode, engine)) {
       return false;
     }
-    
+
     RuleValue rule = matchNode.getRules().get(MatchProperties.EXPRENT_VAR_INDEX);
-    if(rule != null) {
-      if(rule.isVariable()) {
-        if(!engine.checkAndSetVariableValue((String)rule.value, this.index)) {
-          return false;
-        }
-      } else { 
-        if(this.index != Integer.valueOf((String)rule.value).intValue()) {
-          return false;
-        }
+    if (rule != null) {
+      if (rule.isVariable()) {
+        return engine.checkAndSetVariableValue((String)rule.value, this.index);
+      }
+      else {
+        return this.index == Integer.valueOf((String)rule.value);
       }
     }
-    
+
     return true;
   }
-  
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
index abd844c..aa2fae8 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.sforms;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
@@ -27,24 +13,24 @@ import java.util.List;
 
 public class DirectGraph {
 
-  public final VBStyleCollection<DirectNode, String> nodes = new VBStyleCollection<DirectNode, String>();
+  public final VBStyleCollection<DirectNode, String> nodes = new VBStyleCollection<>();
 
   public DirectNode first;
 
   // exit, [source, destination]
-  public final HashMap<String, List<FinallyPathWrapper>> mapShortRangeFinallyPaths = new HashMap<String, List<FinallyPathWrapper>>();
+  public final HashMap<String, List<FinallyPathWrapper>> mapShortRangeFinallyPaths = new HashMap<>();
 
   // exit, [source, destination]
-  public final HashMap<String, List<FinallyPathWrapper>> mapLongRangeFinallyPaths = new HashMap<String, List<FinallyPathWrapper>>();
+  public final HashMap<String, List<FinallyPathWrapper>> mapLongRangeFinallyPaths = new HashMap<>();
 
   // negative if branches (recorded for handling of && and ||)
-  public final HashMap<String, String> mapNegIfBranch = new HashMap<String, String>();
+  public final HashMap<String, String> mapNegIfBranch = new HashMap<>();
 
   // nodes, that are exception exits of a finally block with monitor variable
-  public final HashMap<String, String> mapFinallyMonitorExceptionPathExits = new HashMap<String, String>();
+  public final HashMap<String, String> mapFinallyMonitorExceptionPathExits = new HashMap<>();
 
   public void sortReversePostOrder() {
-    LinkedList<DirectNode> res = new LinkedList<DirectNode>();
+    LinkedList<DirectNode> res = new LinkedList<>();
     addToReversePostOrderListIterative(first, res);
 
     nodes.clear();
@@ -53,12 +39,12 @@ public class DirectGraph {
     }
   }
 
-  private static void addToReversePostOrderListIterative(DirectNode root, List<DirectNode> lst) {
+  private static void addToReversePostOrderListIterative(DirectNode root, List<? super DirectNode> lst) {
 
-    LinkedList<DirectNode> stackNode = new LinkedList<DirectNode>();
-    LinkedList<Integer> stackIndex = new LinkedList<Integer>();
+    LinkedList<DirectNode> stackNode = new LinkedList<>();
+    LinkedList<Integer> stackIndex = new LinkedList<>();
 
-    HashSet<DirectNode> setVisited = new HashSet<DirectNode>();
+    HashSet<DirectNode> setVisited = new HashSet<>();
 
     stackNode.add(root);
     stackIndex.add(0);
@@ -94,10 +80,10 @@ public class DirectGraph {
 
   public boolean iterateExprents(ExprentIterator iter) {
 
-    LinkedList<DirectNode> stack = new LinkedList<DirectNode>();
+    LinkedList<DirectNode> stack = new LinkedList<>();
     stack.add(first);
 
-    HashSet<DirectNode> setVisited = new HashSet<DirectNode>();
+    HashSet<DirectNode> setVisited = new HashSet<>();
 
     while (!stack.isEmpty()) {
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectNode.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectNode.java
index 8a39531..c48d14a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectNode.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectNode.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.sforms;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
@@ -40,11 +26,11 @@ public class DirectNode {
 
   public final Statement statement;
 
-  public List<Exprent> exprents = new ArrayList<Exprent>();
+  public List<Exprent> exprents = new ArrayList<>();
 
-  public final List<DirectNode> succs = new ArrayList<DirectNode>();
+  public final List<DirectNode> succs = new ArrayList<>();
 
-  public final List<DirectNode> preds = new ArrayList<DirectNode>();
+  public final List<DirectNode> preds = new ArrayList<>();
 
   public DirectNode(int type, Statement statement, String id) {
     this.type = type;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
index 971ace5..b9abd11 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.sforms;
 
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
@@ -26,19 +12,19 @@ import java.util.Map.Entry;
 public class FlattenStatementsHelper {
 
   // statement.id, node.id(direct), node.id(continue)
-  private final Map<Integer, String[]> mapDestinationNodes = new HashMap<Integer, String[]>();
+  private final Map<Integer, String[]> mapDestinationNodes = new HashMap<>();
 
   // node.id(source), statement.id(destination), edge type
-  private final List<Edge> listEdges = new ArrayList<Edge>();
+  private final List<Edge> listEdges = new ArrayList<>();
 
   // node.id(exit), [node.id(source), statement.id(destination)]
-  private final Map<String, List<String[]>> mapShortRangeFinallyPathIds = new HashMap<String, List<String[]>>();
+  private final Map<String, List<String[]>> mapShortRangeFinallyPathIds = new HashMap<>();
 
   // node.id(exit), [node.id(source), statement.id(destination)]
-  private final Map<String, List<String[]>> mapLongRangeFinallyPathIds = new HashMap<String, List<String[]>>();
+  private final Map<String, List<String[]>> mapLongRangeFinallyPathIds = new HashMap<>();
 
   // positive if branches
-  private final Map<String, Integer> mapPosIfBranch = new HashMap<String, Integer>();
+  private final Map<String, Integer> mapPosIfBranch = new HashMap<>();
 
   private DirectGraph graph;
 
@@ -55,7 +41,7 @@ public class FlattenStatementsHelper {
     // dummy exit node
     Statement dummyexit = root.getDummyExit();
     DirectNode node = new DirectNode(DirectNode.NODE_DIRECT, dummyexit, dummyexit.id.toString());
-    node.exprents = new ArrayList<Exprent>();
+    node.exprents = new ArrayList<>();
     graph.nodes.addWithKey(node, node.id);
     mapDestinationNodes.put(dummyexit.id, new String[]{node.id, null});
 
@@ -70,24 +56,24 @@ public class FlattenStatementsHelper {
   private void flattenStatement() {
 
     class StatementStackEntry {
-      public Statement statement;
-      public LinkedList<StackEntry> stackFinally;
-      public List<Exprent> tailExprents;
+      public final Statement statement;
+      public final LinkedList<StackEntry> stackFinally;
+      public final List<Exprent> tailExprents;
 
       public int statementIndex;
       public int edgeIndex;
       public List<StatEdge> succEdges;
 
-      public StatementStackEntry(Statement statement, LinkedList<StackEntry> stackFinally, List<Exprent> tailExprents) {
+      StatementStackEntry(Statement statement, LinkedList<StackEntry> stackFinally, List<Exprent> tailExprents) {
         this.statement = statement;
         this.stackFinally = stackFinally;
         this.tailExprents = tailExprents;
       }
     }
 
-    LinkedList<StatementStackEntry> lstStackStatements = new LinkedList<StatementStackEntry>();
+    LinkedList<StatementStackEntry> lstStackStatements = new LinkedList<>();
 
-    lstStackStatements.add(new StatementStackEntry(root, new LinkedList<StackEntry>(), null));
+    lstStackStatements.add(new StatementStackEntry(root, new LinkedList<>(), null));
 
     mainloop:
     while (!lstStackStatements.isEmpty()) {
@@ -100,7 +86,7 @@ public class FlattenStatementsHelper {
 
       DirectNode node, nd;
 
-      List<StatEdge> lstSuccEdges = new ArrayList<StatEdge>();
+      List<StatEdge> lstSuccEdges = new ArrayList<>();
       DirectNode sourcenode = null;
 
       if (statEntry.succEdges == null) {
@@ -143,14 +129,14 @@ public class FlattenStatementsHelper {
             mapDestinationNodes.put(stat.id, new String[]{firstnd.id, null});
             graph.nodes.putWithKey(firstnd, firstnd.id);
 
-            LinkedList<StatementStackEntry> lst = new LinkedList<StatementStackEntry>();
+            LinkedList<StatementStackEntry> lst = new LinkedList<>();
 
             for (Statement st : stat.getStats()) {
               listEdges.add(new Edge(firstnd.id, st.id, StatEdge.TYPE_REGULAR));
 
               LinkedList<StackEntry> stack = stackFinally;
               if (stat.type == Statement.TYPE_CATCHALL && ((CatchAllStatement)stat).isFinally()) {
-                stack = new LinkedList<StackEntry>(stackFinally);
+                stack = new LinkedList<>(stackFinally);
 
                 if (st == stat.getFirst()) { // catch head
                   stack.add(new StackEntry((CatchAllStatement)stat, Boolean.FALSE));
@@ -306,7 +292,7 @@ public class FlattenStatementsHelper {
 
           StatEdge edge = lstSuccEdges.get(edgeindex);
 
-          LinkedList<StackEntry> stack = new LinkedList<StackEntry>(stackFinally);
+          LinkedList<StackEntry> stack = new LinkedList<>(stackFinally);
 
           int edgetype = edge.getType();
           Statement destination = edge.getDestination();
@@ -412,21 +398,19 @@ public class FlattenStatementsHelper {
     }
 
     if (finallyShortRangeSource != null) {
-
       boolean isContinueEdge = (edgetype == StatEdge.TYPE_CONTINUE);
 
-      List<String[]> lst = mapShortRangeFinallyPathIds.get(sourcenode.id);
-      if (lst == null) {
-        mapShortRangeFinallyPathIds.put(sourcenode.id, lst = new ArrayList<String[]>());
-      }
-      lst.add(new String[]{finallyShortRangeSource.id, destination.id.toString(), finallyShortRangeEntry.id.toString(),
-        isFinallyMonitorExceptionPath ? "1" : null, isContinueEdge ? "1" : null});
+      mapShortRangeFinallyPathIds.computeIfAbsent(sourcenode.id, k -> new ArrayList<>()).add(new String[]{
+        finallyShortRangeSource.id,
+        destination.id.toString(),
+        finallyShortRangeEntry.id.toString(),
+        isFinallyMonitorExceptionPath ? "1" : null,
+        isContinueEdge ? "1" : null});
 
-      lst = mapLongRangeFinallyPathIds.get(sourcenode.id);
-      if (lst == null) {
-        mapLongRangeFinallyPathIds.put(sourcenode.id, lst = new ArrayList<String[]>());
-      }
-      lst.add(new String[]{finallyLongRangeSource.id, destination.id.toString(), finallyLongRangeEntry.id.toString(),
+      mapLongRangeFinallyPathIds.computeIfAbsent(sourcenode.id, k -> new ArrayList<>()).add(new String[]{
+        finallyLongRangeSource.id,
+        destination.id.toString(),
+        finallyLongRangeEntry.id.toString(),
         isContinueEdge ? "1" : null});
     }
   }
@@ -458,7 +442,7 @@ public class FlattenStatementsHelper {
     for (int i = 0; i < 2; i++) {
       for (Entry<String, List<String[]>> ent : (i == 0 ? mapShortRangeFinallyPathIds : mapLongRangeFinallyPathIds).entrySet()) {
 
-        List<FinallyPathWrapper> newLst = new ArrayList<FinallyPathWrapper>();
+        List<FinallyPathWrapper> newLst = new ArrayList<>();
 
         List<String[]> lst = ent.getValue();
         for (String[] arr : lst) {
@@ -477,8 +461,8 @@ public class FlattenStatementsHelper {
 
         if (!newLst.isEmpty()) {
           (i == 0 ? graph.mapShortRangeFinallyPaths : graph.mapLongRangeFinallyPaths).put(ent.getKey(),
-                                                                                          new ArrayList<FinallyPathWrapper>(
-                                                                                            new HashSet<FinallyPathWrapper>(newLst)));
+                                                                                          new ArrayList<>(
+                                                                                            new HashSet<>(newLst)));
         }
       }
     }
@@ -502,7 +486,7 @@ public class FlattenStatementsHelper {
     @Override
     public boolean equals(Object o) {
       if (o == this) return true;
-      if (o == null || !(o instanceof FinallyPathWrapper)) return false;
+      if (!(o instanceof FinallyPathWrapper)) return false;
 
       FinallyPathWrapper fpw = (FinallyPathWrapper)o;
       return (source + ":" + destination + ":" + entry).equals(fpw.source + ":" + fpw.destination + ":" + fpw.entry);
@@ -533,7 +517,7 @@ public class FlattenStatementsHelper {
     public final DirectNode finallyShortRangeSource;
     public final DirectNode finallyLongRangeSource;
 
-    public StackEntry(CatchAllStatement catchstatement,
+    StackEntry(CatchAllStatement catchstatement,
                       boolean state,
                       int edgetype,
                       Statement destination,
@@ -555,7 +539,7 @@ public class FlattenStatementsHelper {
       this.finallyLongRangeSource = finallyLongRangeSource;
     }
 
-    public StackEntry(CatchAllStatement catchstatement, boolean state) {
+    StackEntry(CatchAllStatement catchstatement, boolean state) {
       this(catchstatement, state, -1, null, null, null, null, null, false);
     }
   }
@@ -565,7 +549,7 @@ public class FlattenStatementsHelper {
     public final Integer statid;
     public final int edgetype;
 
-    public Edge(String sourceid, Integer statid, int edgetype) {
+    Edge(String sourceid, Integer statid, int edgetype) {
       this.sourceid = sourceid;
       this.statid = statid;
       this.edgetype = edgetype;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
index 76a973f..29e7030 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.sforms;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -33,7 +19,6 @@ import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.jetbrains.java.decompiler.util.SFormsFastMapDirect;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -42,24 +27,22 @@ import java.util.Map.Entry;
 public class SSAConstructorSparseEx {
 
   // node id, var, version
-  private final HashMap<String, SFormsFastMapDirect> inVarVersions = new HashMap<String, SFormsFastMapDirect>();
+  private final HashMap<String, SFormsFastMapDirect> inVarVersions = new HashMap<>();
 
   // node id, var, version (direct branch)
-  private final HashMap<String, SFormsFastMapDirect> outVarVersions = new HashMap<String, SFormsFastMapDirect>();
+  private final HashMap<String, SFormsFastMapDirect> outVarVersions = new HashMap<>();
 
   // node id, var, version (negative branch)
-  private final HashMap<String, SFormsFastMapDirect> outNegVarVersions = new HashMap<String, SFormsFastMapDirect>();
+  private final HashMap<String, SFormsFastMapDirect> outNegVarVersions = new HashMap<>();
 
   // node id, var, version
-  private final HashMap<String, SFormsFastMapDirect> extraVarVersions = new HashMap<String, SFormsFastMapDirect>();
+  private final HashMap<String, SFormsFastMapDirect> extraVarVersions = new HashMap<>();
 
   // (var, version), version
-  private final HashMap<VarVersionPair, FastSparseSet<Integer>> phi = new HashMap<VarVersionPair, FastSparseSet<Integer>>();
+  private final HashMap<VarVersionPair, FastSparseSet<Integer>> phi = new HashMap<>();
 
   // var, version
-  private final HashMap<Integer, Integer> lastversion = new HashMap<Integer, Integer>();
-
-  private final List<VarVersionPair> startVars = new ArrayList<VarVersionPair>();
+  private final HashMap<Integer, Integer> lastversion = new HashMap<>();
 
   // set factory
   private FastSparseSetFactory<Integer> factory;
@@ -73,18 +56,18 @@ public class SSAConstructorSparseEx {
     // DotExporter.toDotFile(dgraph, new File("c:\\Temp\\gr12_my.dot"));
     // } catch(Exception ex) {ex.printStackTrace();}
 
-    HashSet<Integer> setInit = new HashSet<Integer>();
+    HashSet<Integer> setInit = new HashSet<>();
     for (int i = 0; i < 64; i++) {
       setInit.add(i);
     }
-    factory = new FastSparseSetFactory<Integer>(setInit);
+    factory = new FastSparseSetFactory<>(setInit);
 
     SFormsFastMapDirect firstmap = createFirstMap(mt);
     extraVarVersions.put(dgraph.first.id, firstmap);
 
     setCatchMaps(root, dgraph, flatthelper);
 
-    HashSet<String> updated = new HashSet<String>();
+    HashSet<String> updated = new HashSet<>();
     do {
       // System.out.println("~~~~~~~~~~~~~ \r\n"+root.toJava());
       ssaStatements(dgraph, updated);
@@ -260,7 +243,7 @@ public class SSAConstructorSparseEx {
       if (cardinality == 1) { // == 1
         // set version
         Integer it = vers.iterator().next();
-        vardest.setVersion(it.intValue());
+        vardest.setVersion(it);
       }
       else if (cardinality == 2) { // size > 1
         Integer current_vers = vardest.getVersion();
@@ -288,10 +271,10 @@ public class SSAConstructorSparseEx {
   private Integer getNextFreeVersion(Integer var) {
     Integer nextver = lastversion.get(var);
     if (nextver == null) {
-      nextver = new Integer(1);
+      nextver = 1;
     }
     else {
-      nextver = new Integer(nextver.intValue() + 1);
+      nextver++;
     }
     lastversion.put(var, nextver);
     return nextver;
@@ -348,7 +331,7 @@ public class SSAConstructorSparseEx {
       String exceptionDest = dgraph.mapFinallyMonitorExceptionPathExits.get(predid);
       boolean isExceptionMonitorExit = (exceptionDest != null && !nodeid.equals(exceptionDest));
 
-      HashSet<String> setLongPathWrapper = new HashSet<String>();
+      HashSet<String> setLongPathWrapper = new HashSet<>();
       for (FinallyPathWrapper finwraplong : dgraph.mapLongRangeFinallyPaths.get(predid)) {
         setLongPathWrapper.add(finwraplong.destination + "##" + finwraplong.source);
       }
@@ -372,7 +355,7 @@ public class SSAConstructorSparseEx {
         }
 
         // false path?
-        boolean isFalsePath = true;
+        boolean isFalsePath;
 
         if (recFinally) {
           isFalsePath = !finwrap.destination.equals(nodeid);
@@ -477,7 +460,6 @@ public class SSAConstructorSparseEx {
           setCurrentVar(map, varindex, version);
 
           extraVarVersions.put(dgraph.nodes.getWithKey(flatthelper.getMapDestinationNodes().get(stat.getStats().get(i).id)[0]).id, map);
-          startVars.add(new VarVersionPair(varindex, version));
         }
     }
 
@@ -501,7 +483,6 @@ public class SSAConstructorSparseEx {
       FastSparseSet<Integer> set = factory.spawnEmptySet();
       set.add(version);
       map.put(varindex, set);
-      startVars.add(new VarVersionPair(varindex, version));
 
       if (thisvar) {
         if (i == 0) {
@@ -522,8 +503,4 @@ public class SSAConstructorSparseEx {
   public HashMap<VarVersionPair, FastSparseSet<Integer>> getPhi() {
     return phi;
   }
-
-  public List<VarVersionPair> getStartVars() {
-    return startVars;
-  }
 }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
index 95cefcf..4edec05 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.sforms;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -40,42 +26,39 @@ import java.util.Map.Entry;
 public class SSAUConstructorSparseEx {
 
   // node id, var, version
-  private final HashMap<String, SFormsFastMapDirect> inVarVersions = new HashMap<String, SFormsFastMapDirect>();
+  private final HashMap<String, SFormsFastMapDirect> inVarVersions = new HashMap<>();
   //private HashMap<String, HashMap<Integer, FastSet<Integer>>> inVarVersions = new HashMap<String, HashMap<Integer, FastSet<Integer>>>();
 
   // node id, var, version (direct branch)
-  private final HashMap<String, SFormsFastMapDirect> outVarVersions = new HashMap<String, SFormsFastMapDirect>();
+  private final HashMap<String, SFormsFastMapDirect> outVarVersions = new HashMap<>();
   //private HashMap<String, HashMap<Integer, FastSet<Integer>>> outVarVersions = new HashMap<String, HashMap<Integer, FastSet<Integer>>>();
 
   // node id, var, version (negative branch)
-  private final HashMap<String, SFormsFastMapDirect> outNegVarVersions = new HashMap<String, SFormsFastMapDirect>();
+  private final HashMap<String, SFormsFastMapDirect> outNegVarVersions = new HashMap<>();
   //private HashMap<String, HashMap<Integer, FastSet<Integer>>> outNegVarVersions = new HashMap<String, HashMap<Integer, FastSet<Integer>>>();
 
   // node id, var, version
-  private final HashMap<String, SFormsFastMapDirect> extraVarVersions = new HashMap<String, SFormsFastMapDirect>();
+  private final HashMap<String, SFormsFastMapDirect> extraVarVersions = new HashMap<>();
   //private HashMap<String, HashMap<Integer, FastSet<Integer>>> extraVarVersions = new HashMap<String, HashMap<Integer, FastSet<Integer>>>();
 
-  // (var, version), version
-  private final HashMap<VarVersionPair, HashSet<Integer>> phi = new HashMap<VarVersionPair, HashSet<Integer>>();
-
   // var, version
-  private final HashMap<Integer, Integer> lastversion = new HashMap<Integer, Integer>();
+  private final HashMap<Integer, Integer> lastversion = new HashMap<>();
 
   // version, protected ranges (catch, finally)
-  private final HashMap<VarVersionPair, Integer> mapVersionFirstRange = new HashMap<VarVersionPair, Integer>();
+  private final HashMap<VarVersionPair, Integer> mapVersionFirstRange = new HashMap<>();
 
   // version, version
-  private final HashMap<VarVersionPair, VarVersionPair> phantomppnodes = new HashMap<VarVersionPair, VarVersionPair>(); // ++ and --
+  private final HashMap<VarVersionPair, VarVersionPair> phantomppnodes = new HashMap<>(); // ++ and --
 
   // node.id, version, version
   private final HashMap<String, HashMap<VarVersionPair, VarVersionPair>> phantomexitnodes =
-    new HashMap<String, HashMap<VarVersionPair, VarVersionPair>>(); // finally exits
+    new HashMap<>(); // finally exits
 
   // versions memory dependencies
   private final VarVersionsGraph ssuversions = new VarVersionsGraph();
 
   // field access vars (exprent id, var id)
-  private final HashMap<Integer, Integer> mapFieldVars = new HashMap<Integer, Integer>();
+  private final HashMap<Integer, Integer> mapFieldVars = new HashMap<>();
 
   // field access counter
   private int fieldvarcounter = -1;
@@ -88,11 +71,11 @@ public class SSAUConstructorSparseEx {
     FlattenStatementsHelper flatthelper = new FlattenStatementsHelper();
     DirectGraph dgraph = flatthelper.buildDirectGraph(root);
 
-    HashSet<Integer> setInit = new HashSet<Integer>();
+    HashSet<Integer> setInit = new HashSet<>();
     for (int i = 0; i < 64; i++) {
       setInit.add(i);
     }
-    factory = new FastSparseSetFactory<Integer>(setInit);
+    factory = new FastSparseSetFactory<>(setInit);
 
     extraVarVersions.put(dgraph.first.id, createFirstMap(mt, root));
 
@@ -102,7 +85,7 @@ public class SSAUConstructorSparseEx {
     //			DotExporter.toDotFile(dgraph, new File("c:\\Temp\\gr12_my.dot"));
     //		} catch(Exception ex) {ex.printStackTrace();}
 
-    HashSet<String> updated = new HashSet<String>();
+    HashSet<String> updated = new HashSet<>();
     do {
       //			System.out.println("~~~~~~~~~~~~~ \r\n"+root.toJava());
       ssaStatements(dgraph, updated, false);
@@ -358,7 +341,7 @@ public class SSAUConstructorSparseEx {
             if (calcLiveVars) {
               varMapToGraph(varpaar, varmap);
             }
-            setCurrentVar(varmap, varindex.intValue(), var.getVersion());
+            setCurrentVar(varmap, varindex, var.getVersion());
           }
       }
     }
@@ -373,7 +356,7 @@ public class SSAUConstructorSparseEx {
 
       int cardinality = vers.getCardinality();
       if (cardinality == 1) { // size == 1
-        if (current_vers.intValue() != 0) {
+        if (current_vers != 0) {
           if (calcLiveVars) {
             varMapToGraph(new VarVersionPair(varindex, current_vers), varmap);
           }
@@ -398,7 +381,7 @@ public class SSAUConstructorSparseEx {
       }
       else if (cardinality == 2) { // size > 1
 
-        if (current_vers.intValue() != 0) {
+        if (current_vers != 0) {
           if (calcLiveVars) {
             varMapToGraph(new VarVersionPair(varindex, current_vers), varmap);
           }
@@ -426,14 +409,14 @@ public class SSAUConstructorSparseEx {
   private void createOrUpdatePhiNode(VarVersionPair phivar, FastSparseSet<Integer> vers, Statement stat) {
 
     FastSparseSet<Integer> versCopy = vers.getCopy();
-    HashSet<Integer> phiVers = new HashSet<Integer>();
+    HashSet<Integer> phiVers = new HashSet<>();
 
     // take into account the corresponding mm/pp node if existing
     int ppvers = phantomppnodes.containsKey(phivar) ? phantomppnodes.get(phivar).version : -1;
 
     // ssu graph
     VarVersionNode phinode = ssuversions.nodes.getWithKey(phivar);
-    List<VarVersionEdge> lstPreds = new ArrayList<VarVersionEdge>(phinode.preds);
+    List<VarVersionEdge> lstPreds = new ArrayList<>(phinode.preds);
     if (lstPreds.size() == 1) {
       // not yet a phi node
       VarVersionEdge edge = lstPreds.get(0);
@@ -454,8 +437,8 @@ public class SSAUConstructorSparseEx {
       }
     }
 
-    List<VarVersionNode> colnodes = new ArrayList<VarVersionNode>();
-    List<VarVersionPair> colpaars = new ArrayList<VarVersionPair>();
+    List<VarVersionNode> colnodes = new ArrayList<>();
+    List<VarVersionPair> colpaars = new ArrayList<>();
 
     for (Integer ver : versCopy) {
 
@@ -463,7 +446,7 @@ public class SSAUConstructorSparseEx {
 
       Integer tempver = getNextFreeVersion(phivar.var, stat);
 
-      VarVersionNode tempnode = new VarVersionNode(phivar.var, tempver.intValue());
+      VarVersionNode tempnode = new VarVersionNode(phivar.var, tempver);
 
       colnodes.add(tempnode);
       colpaars.add(new VarVersionPair(phivar.var, tempver.intValue()));
@@ -482,9 +465,6 @@ public class SSAUConstructorSparseEx {
     }
 
     ssuversions.addNodes(colnodes, colpaars);
-
-    // update phi node
-    phi.put(phivar, phiVers);
   }
 
   private void varMapToGraph(VarVersionPair varpaar, SFormsFastMapDirect varmap) {
@@ -501,10 +481,10 @@ public class SSAUConstructorSparseEx {
     Integer nextver = lastversion.get(var);
 
     if (nextver == null) {
-      nextver = new Integer(1);
+      nextver = 1;
     }
     else {
-      nextver = new Integer(nextver.intValue() + 1);
+      nextver++;
     }
     lastversion.put(var, nextver);
 
@@ -571,7 +551,7 @@ public class SSAUConstructorSparseEx {
       String exceptionDest = dgraph.mapFinallyMonitorExceptionPathExits.get(predid);
       boolean isExceptionMonitorExit = (exceptionDest != null && !nodeid.equals(exceptionDest));
 
-      HashSet<String> setLongPathWrapper = new HashSet<String>();
+      HashSet<String> setLongPathWrapper = new HashSet<>();
       for (List<FinallyPathWrapper> lstwrapper : dgraph.mapLongRangeFinallyPaths.values()) {
         for (FinallyPathWrapper finwraplong : lstwrapper) {
           setLongPathWrapper.add(finwraplong.destination + "##" + finwraplong.source);
@@ -597,7 +577,7 @@ public class SSAUConstructorSparseEx {
         }
 
         // false path?
-        boolean isFalsePath = true;
+        boolean isFalsePath;
 
         if (recFinally) {
           isFalsePath = !finwrap.destination.equals(nodeid);
@@ -635,7 +615,7 @@ public class SSAUConstructorSparseEx {
           // replace phi versions with corresponding phantom ones
           HashMap<VarVersionPair, VarVersionPair> mapPhantom = phantomexitnodes.get(predid);
           if (mapPhantom == null) {
-            mapPhantom = new HashMap<VarVersionPair, VarVersionPair>();
+            mapPhantom = new HashMap<>();
           }
 
           SFormsFastMapDirect mapExitVar = mapNew.getCopy();
@@ -815,10 +795,6 @@ public class SSAUConstructorSparseEx {
     return null;
   }
 
-  public HashMap<VarVersionPair, HashSet<Integer>> getPhi() {
-    return phi;
-  }
-
   public VarVersionsGraph getSsuversions() {
     return ssuversions;
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
index 762fd01..262a01f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -20,10 +6,10 @@ import org.jetbrains.java.decompiler.code.Instruction;
 import org.jetbrains.java.decompiler.code.SimpleInstructionSequence;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 public class BasicBlockStatement extends Statement {
 
@@ -67,10 +53,14 @@ public class BasicBlockStatement extends Statement {
   // public methods
   // *****************************************************************************
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
-    return ExprProcessor.listToJava(varDefinitions, indent, tracer).append(ExprProcessor.listToJava(exprents, indent, tracer));
+    TextBuffer tb = ExprProcessor.listToJava(varDefinitions, indent, tracer);
+    tb.append(ExprProcessor.listToJava(exprents, indent, tracer));
+    return tb;
   }
 
+  @Override
   public Statement getSimpleCopy() {
 
     BasicBlock newblock = new BasicBlock(
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
index 812ed10..376abe5 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
@@ -1,36 +1,21 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 public class CatchAllStatement extends Statement {
 
@@ -40,7 +25,7 @@ public class CatchAllStatement extends Statement {
 
   private VarExprent monitor;
 
-  private final List<VarExprent> vars = new ArrayList<VarExprent>();
+  private final List<VarExprent> vars = new ArrayList<>();
 
   // *****************************************************************************
   // constructors
@@ -70,7 +55,7 @@ public class CatchAllStatement extends Statement {
 
     vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
                             new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Throwable"),
-                            (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
+                            DecompilerContext.getVarProcessor()));
   }
 
 
@@ -79,13 +64,11 @@ public class CatchAllStatement extends Statement {
   // *****************************************************************************
 
   public static Statement isHead(Statement head) {
-
     if (head.getLastBasicType() != Statement.LASTBASICTYPE_GENERAL) {
       return null;
     }
 
-    HashSet<Statement> setHandlers = DecHelper.getUniquePredExceptions(head);
-
+    Set<Statement> setHandlers = DecHelper.getUniquePredExceptions(head);
     if (setHandlers.size() != 1) {
       return null;
     }
@@ -93,7 +76,7 @@ public class CatchAllStatement extends Statement {
     for (StatEdge edge : head.getSuccessorEdges(StatEdge.TYPE_EXCEPTION)) {
       Statement exc = edge.getDestination();
 
-      if (edge.getExceptions() == null && setHandlers.contains(exc) && exc.getLastBasicType() == LASTBASICTYPE_GENERAL) {
+      if (edge.getExceptions() == null && exc.getLastBasicType() == LASTBASICTYPE_GENERAL && setHandlers.contains(exc)) {
         List<StatEdge> lstSuccs = exc.getSuccessorEdges(STATEDGE_DIRECT_ALL);
         if (lstSuccs.isEmpty() || lstSuccs.get(0).getType() != StatEdge.TYPE_REGULAR) {
 
@@ -111,6 +94,7 @@ public class CatchAllStatement extends Statement {
     return null;
   }
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     String new_line_separator = DecompilerContext.getNewLineSeparator();
 
@@ -144,7 +128,7 @@ public class CatchAllStatement extends Statement {
     tracer.incrementCurrentSourceLine();
 
     if (monitor != null) {
-      buf.appendIndent(indent+1).append("if(").append(monitor.toJava(indent, tracer)).append(") {").appendLineSeparator();
+      buf.appendIndent(indent+1).append("if (").append(monitor.toJava(indent, tracer)).append(") {").appendLineSeparator();
       tracer.incrementCurrentSourceLine();
     }
 
@@ -161,6 +145,7 @@ public class CatchAllStatement extends Statement {
     return buf;
   }
 
+  @Override
   public void replaceStatement(Statement oldstat, Statement newstat) {
 
     if (handler == oldstat) {
@@ -170,6 +155,7 @@ public class CatchAllStatement extends Statement {
     super.replaceStatement(oldstat, newstat);
   }
 
+  @Override
   public Statement getSimpleCopy() {
 
     CatchAllStatement cas = new CatchAllStatement();
@@ -179,19 +165,19 @@ public class CatchAllStatement extends Statement {
     if (this.monitor != null) {
       cas.monitor = new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
                                    VarType.VARTYPE_INT,
-                                   (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR));
+                                   DecompilerContext.getVarProcessor());
     }
 
     if (!this.vars.isEmpty()) {
-      // FIXME: WTF??? vars?!
-      vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
+      cas.vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
                               new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Throwable"),
-                              (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
+                              DecompilerContext.getVarProcessor()));
     }
 
     return cas;
   }
 
+  @Override
   public void initSimpleCopy() {
     first = stats.get(0);
     handler = stats.get(1);
@@ -205,27 +191,18 @@ public class CatchAllStatement extends Statement {
     return handler;
   }
 
-
-  public void setHandler(Statement handler) {
-    this.handler = handler;
-  }
-
-
   public boolean isFinally() {
     return isFinally;
   }
 
-
   public void setFinally(boolean isFinally) {
     this.isFinally = isFinally;
   }
 
-
   public VarExprent getMonitor() {
     return monitor;
   }
 
-
   public void setMonitor(VarExprent monitor) {
     this.monitor = monitor;
   }
@@ -233,4 +210,4 @@ public class CatchAllStatement extends Statement {
   public List<VarExprent> getVars() {
     return vars;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
index 8d56042..652931a 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
@@ -1,42 +1,25 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
-import org.jetbrains.java.decompiler.modules.decompiler.vars.VarProcessor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 public class CatchStatement extends Statement {
-
-  private final List<List<String>> exctstrings = new ArrayList<List<String>>();
-
-  private final List<VarExprent> vars = new ArrayList<VarExprent>();
+  private final List<List<String>> exctstrings = new ArrayList<>();
+  private final List<VarExprent> vars = new ArrayList<>();
 
   // *****************************************************************************
   // constructors
@@ -46,8 +29,7 @@ public class CatchStatement extends Statement {
     type = TYPE_TRYCATCH;
   }
 
-  private CatchStatement(Statement head, Statement next, HashSet<Statement> setHandlers) {
-
+  private CatchStatement(Statement head, Statement next, Set<Statement> setHandlers) {
     this();
 
     first = head;
@@ -58,12 +40,12 @@ public class CatchStatement extends Statement {
 
       if (setHandlers.contains(stat)) {
         stats.addWithKey(stat, stat.id);
-        exctstrings.add(new ArrayList<String>(edge.getExceptions()));
+        exctstrings.add(new ArrayList<>(edge.getExceptions()));
 
         vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
                                 new VarType(CodeConstants.TYPE_OBJECT, 0, edge.getExceptions().get(0)),
                                 // FIXME: for now simply the first type. Should get the first common superclass when possible.
-                                (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
+                                DecompilerContext.getVarProcessor()));
       }
     }
 
@@ -77,15 +59,12 @@ public class CatchStatement extends Statement {
   // *****************************************************************************
 
   public static Statement isHead(Statement head) {
-
     if (head.getLastBasicType() != LASTBASICTYPE_GENERAL) {
       return null;
     }
 
-    HashSet<Statement> setHandlers = DecHelper.getUniquePredExceptions(head);
-
+    Set<Statement> setHandlers = DecHelper.getUniquePredExceptions(head);
     if (!setHandlers.isEmpty()) {
-
       int hnextcount = 0; // either no statements with connection to next, or more than 1
 
       Statement next = null;
@@ -133,7 +112,7 @@ public class CatchStatement extends Statement {
       }
 
       if (hnextcount != 1 && !setHandlers.isEmpty()) {
-        List<Statement> lst = new ArrayList<Statement>();
+        List<Statement> lst = new ArrayList<>();
         lst.add(head);
         lst.addAll(setHandlers);
 
@@ -151,6 +130,7 @@ public class CatchStatement extends Statement {
     return null;
   }
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     TextBuffer buf = new TextBuffer();
 
@@ -190,7 +170,7 @@ public class CatchStatement extends Statement {
       buf.append(vars.get(i - 1).toJava(indent, tracer));
       buf.append(") {").appendLineSeparator();
       tracer.incrementCurrentSourceLine();
-      buf.append(ExprProcessor.jmpWrapper(stat, indent + 1, true, tracer)).appendIndent(indent)
+      buf.append(ExprProcessor.jmpWrapper(stat, indent + 1, false, tracer)).appendIndent(indent)
         .append("}");
     }
     buf.appendLineSeparator();
@@ -199,15 +179,15 @@ public class CatchStatement extends Statement {
     return buf;
   }
 
+  @Override
   public Statement getSimpleCopy() {
-
     CatchStatement cs = new CatchStatement();
 
     for (List<String> exc : this.exctstrings) {
-      cs.exctstrings.add(new ArrayList<String>(exc));
+      cs.exctstrings.add(new ArrayList<>(exc));
       cs.vars.add(new VarExprent(DecompilerContext.getCounterContainer().getCounterAndIncrement(CounterContainer.VAR_COUNTER),
                                  new VarType(CodeConstants.TYPE_OBJECT, 0, exc.get(0)),
-                                 (VarProcessor)DecompilerContext.getProperty(DecompilerContext.CURRENT_VAR_PROCESSOR)));
+                                 DecompilerContext.getVarProcessor()));
     }
 
     return cs;
@@ -220,4 +200,4 @@ public class CatchStatement extends Statement {
   public List<VarExprent> getVars() {
     return vars;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
index ef5ea76..f9a149f 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
@@ -1,25 +1,11 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,9 +20,9 @@ public class DoStatement extends Statement {
 
   private int looptype;
 
-  private final List<Exprent> initExprent = new ArrayList<Exprent>();
-  private final List<Exprent> conditionExprent = new ArrayList<Exprent>();
-  private final List<Exprent> incExprent = new ArrayList<Exprent>();
+  private final List<Exprent> initExprent = new ArrayList<>();
+  private final List<Exprent> conditionExprent = new ArrayList<>();
+  private final List<Exprent> incExprent = new ArrayList<>();
 
   // *****************************************************************************
   // constructors
@@ -91,6 +77,7 @@ public class DoStatement extends Statement {
     return null;
   }
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     TextBuffer buf = new TextBuffer();
 
@@ -105,21 +92,21 @@ public class DoStatement extends Statement {
       case LOOP_DO:
         buf.appendIndent(indent).append("while(true) {").appendLineSeparator();
         tracer.incrementCurrentSourceLine();
-        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, true, tracer));
+        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, false, tracer));
         buf.appendIndent(indent).append("}").appendLineSeparator();
         tracer.incrementCurrentSourceLine();
         break;
       case LOOP_DOWHILE:
         buf.appendIndent(indent).append("do {").appendLineSeparator();
         tracer.incrementCurrentSourceLine();
-        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, true, tracer));
+        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, false, tracer));
         buf.appendIndent(indent).append("} while(").append(conditionExprent.get(0).toJava(indent, tracer)).append(");").appendLineSeparator();
         tracer.incrementCurrentSourceLine();
         break;
       case LOOP_WHILE:
         buf.appendIndent(indent).append("while(").append(conditionExprent.get(0).toJava(indent, tracer)).append(") {").appendLineSeparator();
         tracer.incrementCurrentSourceLine();
-        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, true, tracer));
+        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, false, tracer));
         buf.appendIndent(indent).append("}").appendLineSeparator();
         tracer.incrementCurrentSourceLine();
         break;
@@ -132,7 +119,7 @@ public class DoStatement extends Statement {
           .append(conditionExprent.get(0).toJava(indent, tracer)).append("; ").append(incExprent.get(0).toJava(indent, tracer)).append(") {")
           .appendLineSeparator();
         tracer.incrementCurrentSourceLine();
-        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, true, tracer));
+        buf.append(ExprProcessor.jmpWrapper(first, indent + 1, false, tracer));
         buf.appendIndent(indent).append("}").appendLineSeparator();
         tracer.incrementCurrentSourceLine();
     }
@@ -140,9 +127,10 @@ public class DoStatement extends Statement {
     return buf;
   }
 
+  @Override
   public List<Object> getSequentialObjects() {
 
-    List<Object> lst = new ArrayList<Object>();
+    List<Object> lst = new ArrayList<>();
 
     switch (looptype) {
       case LOOP_FOR:
@@ -166,6 +154,7 @@ public class DoStatement extends Statement {
     return lst;
   }
 
+  @Override
   public void replaceExprent(Exprent oldexpr, Exprent newexpr) {
     if (initExprent.get(0) == oldexpr) {
       initExprent.set(0, newexpr);
@@ -178,6 +167,7 @@ public class DoStatement extends Statement {
     }
   }
 
+  @Override
   public Statement getSimpleCopy() {
     return new DoStatement();
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
index ba82182..0b6e58b 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DummyExitStatement.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import java.util.Collection;
@@ -32,7 +18,7 @@ public class DummyExitStatement extends Statement {
   public void addBytecodeOffsets(Collection<Integer> bytecodeOffsets) {
     if (bytecodeOffsets != null && !bytecodeOffsets.isEmpty()) {
       if (bytecode == null) {
-        bytecode = new HashSet<Integer>(bytecodeOffsets);
+        bytecode = new HashSet<>(bytecodeOffsets);
       }
       else {
         bytecode.addAll(bytecodeOffsets);
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
index 4f22cf7..0891a47 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
@@ -1,22 +1,8 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -32,14 +18,14 @@ public class GeneralStatement extends Statement {
     type = Statement.TYPE_GENERAL;
   }
 
-  public GeneralStatement(Statement head, Collection<Statement> statements, Statement post) {
+  public GeneralStatement(Statement head, Collection<? extends Statement> statements, Statement post) {
 
     this();
 
     first = head;
     stats.addWithKey(head, head.id);
 
-    HashSet<Statement> set = new HashSet<Statement>(statements);
+    HashSet<Statement> set = new HashSet<>(statements);
     set.remove(head);
 
     for (Statement st : set) {
@@ -53,6 +39,7 @@ public class GeneralStatement extends Statement {
   // public methods
   // *****************************************************************************
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     TextBuffer buf = new TextBuffer();
 
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
index 8be0dcc..bf18c51 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
@@ -1,21 +1,6 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
@@ -25,8 +10,8 @@ import org.jetbrains.java.decompiler.modules.decompiler.exps.IfExprent;
 import org.jetbrains.java.decompiler.struct.match.IMatchable;
 import org.jetbrains.java.decompiler.struct.match.MatchEngine;
 import org.jetbrains.java.decompiler.struct.match.MatchNode;
-import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
-import org.jetbrains.java.decompiler.util.InterpreterUtil;
+import org.jetbrains.java.decompiler.util.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -51,9 +36,7 @@ public class IfStatement extends Statement {
 
   private boolean negated = false;
 
-  private boolean iffflag;
-
-  private final List<Exprent> headexprent = new ArrayList<Exprent>(); // contains IfExprent
+  private final List<Exprent> headexprent = new ArrayList<>(1); // contains IfExprent
 
   // *****************************************************************************
   // constructors
@@ -182,7 +165,7 @@ public class IfStatement extends Statement {
 
       boolean ok = (regsize < 2);
       if (!ok) {
-        List<Statement> lst = new ArrayList<Statement>();
+        List<Statement> lst = new ArrayList<>();
         if (DecHelper.isChoiceStatement(head, lst)) {
           p = lst.remove(0);
 
@@ -204,8 +187,8 @@ public class IfStatement extends Statement {
     return null;
   }
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
-    String indstr = InterpreterUtil.getIndentString(indent);
     TextBuffer buf = new TextBuffer();
 
     buf.append(ExprProcessor.listToJava(varDefinitions, indent, tracer));
@@ -220,24 +203,26 @@ public class IfStatement extends Statement {
     tracer.incrementCurrentSourceLine();
 
     if (ifstat == null) {
-      buf.appendIndent(indent + 1);
-
+      boolean semicolon = false;
       if (ifedge.explicit) {
+        semicolon = true;
         if (ifedge.getType() == StatEdge.TYPE_BREAK) {
           // break
-          buf.append("break");
+          buf.appendIndent(indent + 1).append("break");
         }
         else {
           // continue
-          buf.append("continue");
+          buf.appendIndent(indent + 1).append("continue");
         }
 
         if (ifedge.labeled) {
           buf.append(" label").append(ifedge.closure.id.toString());
         }
       }
-      buf.append(";").appendLineSeparator();
-      tracer.incrementCurrentSourceLine();
+      if(semicolon) {
+        buf.append(";").appendLineSeparator();
+        tracer.incrementCurrentSourceLine();
+      }
     }
     else {
       buf.append(ExprProcessor.jmpWrapper(ifstat, indent + 1, true, tracer));
@@ -251,10 +236,10 @@ public class IfStatement extends Statement {
           !elsestat.isLabeled() &&
           (elsestat.getSuccessorEdges(STATEDGE_DIRECT_ALL).isEmpty()
            || !elsestat.getSuccessorEdges(STATEDGE_DIRECT_ALL).get(0).explicit)) { // else if
-        TextBuffer content = ExprProcessor.jmpWrapper(elsestat, indent, false, tracer);
-        content.setStart(indstr.length());
-
         buf.appendIndent(indent).append("} else ");
+
+        TextBuffer content = ExprProcessor.jmpWrapper(elsestat, indent, false, tracer);
+        content.setStart(TextUtil.getIndentString(indent).length());
         buf.append(content);
 
         elseif = true;
@@ -282,6 +267,7 @@ public class IfStatement extends Statement {
     return buf;
   }
 
+  @Override
   public void initExprents() {
 
     IfExprent ifexpr = (IfExprent)first.getExprents().remove(first.getExprents().size() - 1);
@@ -294,20 +280,23 @@ public class IfStatement extends Statement {
     headexprent.set(0, ifexpr);
   }
 
+  @Override
   public List<Object> getSequentialObjects() {
 
-    List<Object> lst = new ArrayList<Object>(stats);
+    List<Object> lst = new ArrayList<>(stats);
     lst.add(1, headexprent.get(0));
 
     return lst;
   }
 
+  @Override
   public void replaceExprent(Exprent oldexpr, Exprent newexpr) {
     if (headexprent.get(0) == oldexpr) {
       headexprent.set(0, newexpr);
     }
   }
 
+  @Override
   public void replaceStatement(Statement oldstat, Statement newstat) {
 
     super.replaceStatement(oldstat, newstat);
@@ -340,16 +329,17 @@ public class IfStatement extends Statement {
     }
   }
 
+  @Override
   public Statement getSimpleCopy() {
 
     IfStatement is = new IfStatement();
     is.iftype = this.iftype;
     is.negated = this.negated;
-    is.iffflag = this.iffflag;
 
     return is;
   }
 
+  @Override
   public void initSimpleCopy() {
 
     first = stats.get(0);
@@ -402,14 +392,6 @@ public class IfStatement extends Statement {
     return (IfExprent)headexprent.get(0);
   }
 
-  public boolean isIffflag() {
-    return iffflag;
-  }
-
-  public void setIffflag(boolean iffflag) {
-    this.iffflag = iffflag;
-  }
-
   public void setElseEdge(StatEdge elseedge) {
     this.elseedge = elseedge;
   }
@@ -425,21 +407,21 @@ public class IfStatement extends Statement {
   public StatEdge getElseEdge() {
     return elseedge;
   }
-  
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
-  public IMatchable findObject(MatchNode matchNode, int index) {
 
+  @Override
+  public IMatchable findObject(MatchNode matchNode, int index) {
     IMatchable object = super.findObject(matchNode, index);
-    if(object != null) {
+    if (object != null) {
       return object;
     }
-    
-    if(matchNode.getType() == MatchNode.MATCHNODE_EXPRENT) {
+
+    if (matchNode.getType() == MatchNode.MATCHNODE_EXPRENT) {
       String position = (String)matchNode.getRuleValue(MatchProperties.EXPRENT_POSITION);
-      if("head".equals(position)) {
+      if ("head".equals(position)) {
         return getHeadexprent();
       }
     }
@@ -447,20 +429,13 @@ public class IfStatement extends Statement {
     return null;
   }
 
+  @Override
   public boolean match(MatchNode matchNode, MatchEngine engine) {
-
-    if(!super.match(matchNode, engine)) {
+    if (!super.match(matchNode, engine)) {
       return false;
     }
 
     Integer type = (Integer)matchNode.getRuleValue(MatchProperties.STATEMENT_IFTYPE);
-    if(type != null) {
-      if(this.iftype != type.intValue()) {
-        return false;
-      }
-    }
-        
-    return true;
+    return type == null || this.iftype == type;
   }
-  
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
index 7193f9a..61eca33 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
@@ -1,31 +1,14 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
-
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 public class RootStatement extends Statement {
-
-  private DummyExitStatement dummyExit;
+  private final DummyExitStatement dummyExit;
 
   public RootStatement(Statement head, DummyExitStatement dummyExit) {
-
     type = Statement.TYPE_ROOT;
 
     first = head;
@@ -35,6 +18,7 @@ public class RootStatement extends Statement {
     first.setParent(this);
   }
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     return ExprProcessor.listToJava(varDefinitions, indent, tracer).append(first.toJava(indent, tracer));
   }
@@ -42,8 +26,4 @@ public class RootStatement extends Statement {
   public DummyExitStatement getDummyExit() {
     return dummyExit;
   }
-
-  public void setDummyExit(DummyExitStatement dummyExit) {
-    this.dummyExit = dummyExit;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
index 7d2ee43..8aa6adc 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
@@ -1,25 +1,11 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.Arrays;
 import java.util.List;
@@ -36,7 +22,7 @@ public class SequenceStatement extends Statement {
     type = Statement.TYPE_SEQUENCE;
   }
 
-  public SequenceStatement(List<Statement> lst) {
+  public SequenceStatement(List<? extends Statement> lst) {
 
     this();
 
@@ -98,6 +84,7 @@ public class SequenceStatement extends Statement {
     return null;
   }
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     TextBuffer buf = new TextBuffer();
     boolean islabeled = isLabeled();
@@ -134,6 +121,7 @@ public class SequenceStatement extends Statement {
     return buf;
   }
 
+  @Override
   public Statement getSimpleCopy() {
     return new SequenceStatement();
   }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
index ced701f..b5e8213 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
@@ -1,24 +1,12 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.code.InstructionSequence;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
@@ -34,9 +22,8 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class Statement implements IMatchable {
-
-  public static final int STATEDGE_ALL = 1 << 31;
-  public static final int STATEDGE_DIRECT_ALL = 1 << 30;
+  public static final int STATEDGE_ALL = 0x80000000;
+  public static final int STATEDGE_DIRECT_ALL = 0x40000000;
 
   public static final int DIRECTION_BACKWARD = 0;
   public static final int DIRECTION_FORWARD = 1;
@@ -47,7 +34,7 @@ public class Statement implements IMatchable {
   public static final int TYPE_SWITCH = 6;
   public static final int TYPE_TRYCATCH = 7;
   public static final int TYPE_BASICBLOCK = 8;
-  public static final int TYPE_FINALLY = 9;
+  //public static final int TYPE_FINALLY = 9;
   public static final int TYPE_SYNCRONIZED = 10;
   public static final int TYPE_PLACEHOLDER = 11;
   public static final int TYPE_CATCHALL = 12;
@@ -55,7 +42,6 @@ public class Statement implements IMatchable {
   public static final int TYPE_DUMMYEXIT = 14;
   public static final int TYPE_SEQUENCE = 15;
 
-
   public static final int LASTBASICTYPE_IF = 0;
   public static final int LASTBASICTYPE_SWITCH = 1;
   public static final int LASTBASICTYPE_GENERAL = 2;
@@ -73,14 +59,14 @@ public class Statement implements IMatchable {
   // private fields
   // *****************************************************************************
 
-  private final Map<Integer, List<StatEdge>> mapSuccEdges = new HashMap<Integer, List<StatEdge>>();
-  private final Map<Integer, List<StatEdge>> mapPredEdges = new HashMap<Integer, List<StatEdge>>();
+  private final Map<Integer, List<StatEdge>> mapSuccEdges = new HashMap<>();
+  private final Map<Integer, List<StatEdge>> mapPredEdges = new HashMap<>();
 
-  private final Map<Integer, List<Statement>> mapSuccStates = new HashMap<Integer, List<Statement>>();
-  private final Map<Integer, List<Statement>> mapPredStates = new HashMap<Integer, List<Statement>>();
+  private final Map<Integer, List<Statement>> mapSuccStates = new HashMap<>();
+  private final Map<Integer, List<Statement>> mapPredStates = new HashMap<>();
 
   // statement as graph
-  protected final VBStyleCollection<Statement, Integer> stats = new VBStyleCollection<Statement, Integer>();
+  protected final VBStyleCollection<Statement, Integer> stats = new VBStyleCollection<>();
 
   protected Statement parent;
 
@@ -88,9 +74,9 @@ public class Statement implements IMatchable {
 
   protected List<Exprent> exprents;
 
-  protected final HashSet<StatEdge> labelEdges = new HashSet<StatEdge>();
+  protected final HashSet<StatEdge> labelEdges = new HashSet<>();
 
-  protected final List<Exprent> varDefinitions = new ArrayList<Exprent>();
+  protected final List<Exprent> varDefinitions = new ArrayList<>();
 
   // copied statement, s. deobfuscating of irreducible CFGs
   private boolean copied = false;
@@ -106,7 +92,7 @@ public class Statement implements IMatchable {
 
   protected boolean containsMonitorExit;
 
-  protected HashSet<Statement> continueSet = new HashSet<Statement>();
+  protected HashSet<Statement> continueSet = new HashSet<>();
 
   // *****************************************************************************
   // initializers
@@ -143,7 +129,7 @@ public class Statement implements IMatchable {
 
     List<T> lst = map.get(STATEDGE_DIRECT_ALL);
     if (lst != null) {
-      map.put(STATEDGE_ALL, new ArrayList<T>(lst));
+      map.put(STATEDGE_ALL, new ArrayList<>(lst));
     }
     else {
       map.remove(STATEDGE_ALL);
@@ -186,7 +172,7 @@ public class Statement implements IMatchable {
     }
 
     // exception edges
-    Set<Statement> setHandlers = new HashSet<Statement>(head.getNeighbours(StatEdge.TYPE_EXCEPTION, DIRECTION_FORWARD));
+    Set<Statement> setHandlers = new HashSet<>(head.getNeighbours(StatEdge.TYPE_EXCEPTION, DIRECTION_FORWARD));
     for (Statement node : setNodes) {
       setHandlers.retainAll(node.getNeighbours(StatEdge.TYPE_EXCEPTION, DIRECTION_FORWARD));
     }
@@ -254,25 +240,15 @@ public class Statement implements IMatchable {
   }
 
   private void addEdgeDirectInternal(int direction, StatEdge edge, int edgetype) {
-
     Map<Integer, List<StatEdge>> mapEdges = direction == DIRECTION_BACKWARD ? mapPredEdges : mapSuccEdges;
     Map<Integer, List<Statement>> mapStates = direction == DIRECTION_BACKWARD ? mapPredStates : mapSuccStates;
 
-    List<StatEdge> lst = mapEdges.get(edgetype);
-    if (lst == null) {
-      mapEdges.put(edgetype, lst = new ArrayList<StatEdge>());
-    }
-    lst.add(edge);
+    mapEdges.computeIfAbsent(edgetype, k -> new ArrayList<>()).add(edge);
 
-    List<Statement> lstStates = mapStates.get(edgetype);
-    if (lstStates == null) {
-      mapStates.put(edgetype, lstStates = new ArrayList<Statement>());
-    }
-    lstStates.add(direction == DIRECTION_BACKWARD ? edge.getSource() : edge.getDestination());
+    mapStates.computeIfAbsent(edgetype, k -> new ArrayList<>()).add(direction == DIRECTION_BACKWARD ? edge.getSource() : edge.getDestination());
   }
 
   private void addEdgeInternal(int direction, StatEdge edge) {
-
     int type = edge.getType();
 
     int[] arrtypes;
@@ -442,7 +418,7 @@ public class Statement implements IMatchable {
   }
 
   public List<Statement> getReversePostOrderList(Statement stat) {
-    List<Statement> res = new ArrayList<Statement>();
+    List<Statement> res = new ArrayList<>();
 
     addToReversePostOrderListIterative(stat, res);
 
@@ -455,14 +431,14 @@ public class Statement implements IMatchable {
 
   public List<Statement> getPostReversePostOrderList(List<Statement> lstexits) {
 
-    List<Statement> res = new ArrayList<Statement>();
+    List<Statement> res = new ArrayList<>();
 
     if (lstexits == null) {
       StrongConnectivityHelper schelper = new StrongConnectivityHelper(this);
       lstexits = StrongConnectivityHelper.getExitReps(schelper.getComponents());
     }
 
-    HashSet<Statement> setVisited = new HashSet<Statement>();
+    HashSet<Statement> setVisited = new HashSet<>();
 
     for (Statement exit : lstexits) {
       addToPostReversePostOrderList(exit, res, setVisited);
@@ -480,13 +456,12 @@ public class Statement implements IMatchable {
   }
 
   public boolean containsStatementStrict(Statement stat) {
-
     if (stats.contains(stat)) {
       return true;
     }
 
-    for (int i = 0; i < stats.size(); i++) {
-      if (stats.get(i).containsStatementStrict(stat)) {
+    for (Statement st : stats) {
+      if (st.containsStatementStrict(stat)) {
         return true;
       }
     }
@@ -494,18 +469,13 @@ public class Statement implements IMatchable {
     return false;
   }
 
-  // to be overwritten
-  public TextBuffer toJava() {
-    return toJava(0, new BytecodeMappingTracer());
-  }
-
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     throw new RuntimeException("not implemented");
   }
 
   // TODO: make obsolete and remove
   public List<Object> getSequentialObjects() {
-    return new ArrayList<Object>(stats);
+    return new ArrayList<>(stats);
   }
 
   public void initExprents() {
@@ -551,7 +521,7 @@ public class Statement implements IMatchable {
       first = newstat;
     }
 
-    List<StatEdge> lst = new ArrayList<StatEdge>(oldstat.getLabelEdges());
+    List<StatEdge> lst = new ArrayList<>(oldstat.getLabelEdges());
 
     for (int i = lst.size() - 1; i >= 0; i--) {
       StatEdge edge = lst.get(i);
@@ -576,11 +546,11 @@ public class Statement implements IMatchable {
   // private methods
   // *****************************************************************************
 
-  private static void addToReversePostOrderListIterative(Statement root, List<Statement> lst) {
+  private static void addToReversePostOrderListIterative(Statement root, List<? super Statement> lst) {
 
-    LinkedList<Statement> stackNode = new LinkedList<Statement>();
-    LinkedList<Integer> stackIndex = new LinkedList<Integer>();
-    HashSet<Statement> setVisited = new HashSet<Statement>();
+    LinkedList<Statement> stackNode = new LinkedList<>();
+    LinkedList<Integer> stackIndex = new LinkedList<>();
+    HashSet<Statement> setVisited = new HashSet<>();
 
     stackNode.add(root);
     stackIndex.add(0);
@@ -619,7 +589,7 @@ public class Statement implements IMatchable {
   }
 
 
-  private static void addToPostReversePostOrderList(Statement stat, List<Statement> lst, HashSet<Statement> setVisited) {
+  private static void addToPostReversePostOrderList(Statement stat, List<? super Statement> lst, HashSet<? super Statement> setVisited) {
 
     if (setVisited.contains(stat)) { // because of not considered exception edges, s. isExitComponent. Should be rewritten, if possible.
       return;
@@ -702,10 +672,10 @@ public class Statement implements IMatchable {
     List<StatEdge> res;
     if ((type & (type - 1)) == 0) {
       res = map.get(type);
-      res = res == null ? new ArrayList<StatEdge>() : new ArrayList<StatEdge>(res);
+      res = res == null ? new ArrayList<>() : new ArrayList<>(res);
     }
     else {
-      res = new ArrayList<StatEdge>();
+      res = new ArrayList<>();
       for (int edgetype : StatEdge.TYPES) {
         if ((type & edgetype) != 0) {
           List<StatEdge> lst = map.get(edgetype);
@@ -726,10 +696,10 @@ public class Statement implements IMatchable {
     List<Statement> res;
     if ((type & (type - 1)) == 0) {
       res = map.get(type);
-      res = res == null ? new ArrayList<Statement>() : new ArrayList<Statement>(res);
+      res = res == null ? new ArrayList<>() : new ArrayList<>(res);
     }
     else {
-      res = new ArrayList<Statement>();
+      res = new ArrayList<>();
       for (int edgetype : StatEdge.TYPES) {
         if ((type & edgetype) != 0) {
           List<Statement> lst = map.get(edgetype);
@@ -744,7 +714,7 @@ public class Statement implements IMatchable {
   }
 
   public Set<Statement> getNeighboursSet(int type, int direction) {
-    return new HashSet<Statement>(getNeighbours(type, direction));
+    return new HashSet<>(getNeighbours(type, direction));
   }
 
   public List<StatEdge> getSuccessorEdges(int type) {
@@ -775,10 +745,6 @@ public class Statement implements IMatchable {
     return post;
   }
 
-  public void setPost(Statement post) {
-    this.post = post;
-  }
-
   public VBStyleCollection<Statement, Integer> getStats() {
     return stats;
   }
@@ -864,31 +830,34 @@ public class Statement implements IMatchable {
   public String toString() {
     return id.toString();
   }
-  
+
   // *****************************************************************************
   // IMatchable implementation
   // *****************************************************************************
-  
+
+  @Override
   public IMatchable findObject(MatchNode matchNode, int index) {
-    
     int node_type = matchNode.getType();
-    
+
     if (node_type == MatchNode.MATCHNODE_STATEMENT && !this.stats.isEmpty()) {
       String position = (String)matchNode.getRuleValue(MatchProperties.STATEMENT_POSITION);
-      if(position != null) {
-        if(position.matches("-?\\d+")) {
+      if (position != null) {
+        if (position.matches("-?\\d+")) {
           return this.stats.get((this.stats.size() + Integer.parseInt(position)) % this.stats.size()); // care for negative positions
         }
-      } else if(index < this.stats.size()) { // use 'index' parameter
+      }
+      else if (index < this.stats.size()) { // use 'index' parameter
         return this.stats.get(index);
       }
-    } else if(node_type == MatchNode.MATCHNODE_EXPRENT && this.exprents != null && !this.exprents.isEmpty()) {
+    }
+    else if (node_type == MatchNode.MATCHNODE_EXPRENT && this.exprents != null && !this.exprents.isEmpty()) {
       String position = (String)matchNode.getRuleValue(MatchProperties.EXPRENT_POSITION);
-      if(position != null) {
-        if(position.matches("-?\\d+")) {
+      if (position != null) {
+        if (position.matches("-?\\d+")) {
           return this.exprents.get((this.exprents.size() + Integer.parseInt(position)) % this.exprents.size()); // care for negative positions
         }
-      } else if(index < this.exprents.size()) { // use 'index' parameter
+      }
+      else if (index < this.exprents.size()) { // use 'index' parameter
         return this.exprents.get(index);
       }
     }
@@ -896,46 +865,45 @@ public class Statement implements IMatchable {
     return null;
   }
 
+  @Override
   public boolean match(MatchNode matchNode, MatchEngine engine) {
-    
-    if(matchNode.getType() != MatchNode.MATCHNODE_STATEMENT) {
+    if (matchNode.getType() != MatchNode.MATCHNODE_STATEMENT) {
       return false;
     }
-    
-    for(Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
-      switch(rule.getKey()) {
-      case STATEMENT_TYPE:
-        if(this.type != ((Integer)rule.getValue().value).intValue()) {
-          return false;
-        }
-        break;
-      case STATEMENT_STATSIZE:
-        if(this.stats.size() != ((Integer)rule.getValue().value).intValue()) {
-          return false;
-        }
-        break;
-      case STATEMENT_EXPRSIZE:
-        int exprsize = ((Integer)rule.getValue().value).intValue();
-        if(exprsize == -1) {
-          if(this.exprents != null) {
+
+    for (Entry<MatchProperties, RuleValue> rule : matchNode.getRules().entrySet()) {
+      switch (rule.getKey()) {
+        case STATEMENT_TYPE:
+          if (this.type != (Integer)rule.getValue().value) {
             return false;
           }
-        } else {
-          if(this.exprents == null || this.exprents.size() != exprsize) {
+          break;
+        case STATEMENT_STATSIZE:
+          if (this.stats.size() != (Integer)rule.getValue().value) {
             return false;
           }
-        }
-        break;
-      case STATEMENT_RET:
-        if(!engine.checkAndSetVariableValue((String)rule.getValue().value, this)) {
-          return false;
-        }
-        break;
+          break;
+        case STATEMENT_EXPRSIZE:
+          int exprsize = (Integer)rule.getValue().value;
+          if (exprsize == -1) {
+            if (this.exprents != null) {
+              return false;
+            }
+          }
+          else {
+            if (this.exprents == null || this.exprents.size() != exprsize) {
+              return false;
+            }
+          }
+          break;
+        case STATEMENT_RET:
+          if (!engine.checkAndSetVariableValue((String)rule.getValue().value, this)) {
+            return false;
+          }
+          break;
       }
-      
     }
-    
+
     return true;
   }
-  
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statements.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statements.java
new file mode 100644
index 0000000..cadf50f
--- /dev/null
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statements.java
@@ -0,0 +1,44 @@
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.java.decompiler.modules.decompiler.stats;
+
+import org.jetbrains.java.decompiler.main.rels.ClassWrapper;
+import org.jetbrains.java.decompiler.main.rels.MethodWrapper;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.InvocationExprent;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
+import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
+
+public class Statements {
+  public static Statement findFirstData(Statement stat) {
+    if (stat.getExprents() != null) {
+      return stat;
+    }
+    else if (stat.isLabeled()) { // FIXME: Why??
+      return null;
+    }
+
+    switch (stat.type) {
+      case Statement.TYPE_SEQUENCE:
+      case Statement.TYPE_IF:
+      case Statement.TYPE_ROOT:
+      case Statement.TYPE_SWITCH:
+      case Statement.TYPE_SYNCRONIZED:
+        return findFirstData(stat.getFirst());
+      default:
+        return null;
+    }
+  }
+
+  public static boolean isInvocationInitConstructor(InvocationExprent inv, MethodWrapper method, ClassWrapper wrapper, boolean withThis) {
+    if (inv.getFunctype() == InvocationExprent.TYP_INIT && inv.getInstance().type == Exprent.EXPRENT_VAR) {
+      VarExprent instVar = (VarExprent)inv.getInstance();
+      VarVersionPair varPair = new VarVersionPair(instVar);
+      String className = method.varproc.getThisVars().get(varPair);
+      if (className != null) { // any this instance. TODO: Restrict to current class?
+        return withThis || !wrapper.getClassStruct().qualifiedName.equals(inv.getClassname());
+      }
+    }
+
+    return false;
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
index 5916490..6633d80 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
@@ -1,33 +1,21 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.SwitchInstruction;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.main.collectors.CounterContainer;
 import org.jetbrains.java.decompiler.modules.decompiler.DecHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
+import org.jetbrains.java.decompiler.modules.decompiler.SwitchHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.ConstExprent;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.FieldExprent;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.SwitchExprent;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.*;
 
@@ -37,15 +25,15 @@ public class SwitchStatement extends Statement {
   // private fields
   // *****************************************************************************
 
-  private List<Statement> caseStatements = new ArrayList<Statement>();
+  private List<Statement> caseStatements = new ArrayList<>();
 
-  private List<List<StatEdge>> caseEdges = new ArrayList<List<StatEdge>>();
+  private List<List<StatEdge>> caseEdges = new ArrayList<>();
 
-  private List<List<ConstExprent>> caseValues = new ArrayList<List<ConstExprent>>();
+  private List<List<Exprent>> caseValues = new ArrayList<>();
 
   private StatEdge default_edge;
 
-  private final List<Exprent> headexprent = new ArrayList<Exprent>();
+  private final List<Exprent> headexprent = new ArrayList<>(1);
 
   // *****************************************************************************
   // constructors
@@ -65,7 +53,7 @@ public class SwitchStatement extends Statement {
     stats.addWithKey(head, head.id);
 
     // find post node
-    Set<Statement> lstNodes = new HashSet<Statement>(head.getNeighbours(StatEdge.TYPE_REGULAR, DIRECTION_FORWARD));
+    Set<Statement> lstNodes = new HashSet<>(head.getNeighbours(StatEdge.TYPE_REGULAR, DIRECTION_FORWARD));
 
     // cluster nodes
     if (poststat != null) {
@@ -88,7 +76,7 @@ public class SwitchStatement extends Statement {
 
     if (head.type == Statement.TYPE_BASICBLOCK && head.getLastBasicType() == Statement.LASTBASICTYPE_SWITCH) {
 
-      List<Statement> lst = new ArrayList<Statement>();
+      List<Statement> lst = new ArrayList<>();
       if (DecHelper.isChoiceStatement(head, lst)) {
         Statement post = lst.remove(0);
 
@@ -107,7 +95,10 @@ public class SwitchStatement extends Statement {
     return null;
   }
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
+    SwitchHelper.simplify(this);
+
     TextBuffer buf = new TextBuffer();
     buf.append(ExprProcessor.listToJava(varDefinitions, indent, tracer));
     buf.append(first.toJava(indent, tracer));
@@ -126,7 +117,7 @@ public class SwitchStatement extends Statement {
 
       Statement stat = caseStatements.get(i);
       List<StatEdge> edges = caseEdges.get(i);
-      List<ConstExprent> values = caseValues.get(i);
+      List<Exprent> values = caseValues.get(i);
 
       for (int j = 0; j < edges.size(); j++) {
         if (edges.get(j) == default_edge) {
@@ -134,10 +125,20 @@ public class SwitchStatement extends Statement {
           tracer.incrementCurrentSourceLine();
         }
         else {
-          ConstExprent value = (ConstExprent)values.get(j).copy();
-          value.setConstType(switch_type);
+          buf.appendIndent(indent).append("case ");
+          Exprent value = values.get(j);
+          if (value instanceof ConstExprent) {
+            value = value.copy();
+            ((ConstExprent)value).setConstType(switch_type);
+          }
+          if (value instanceof FieldExprent && ((FieldExprent)value).isStatic()) { // enum values
+            buf.append(((FieldExprent)value).getName());
+          }
+          else {
+            buf.append(value.toJava(indent, tracer));
+          }
 
-          buf.appendIndent(indent).append("case ").append(value.toJava(indent, tracer)).append(":").appendLineSeparator();
+          buf.append(":").appendLineSeparator();
           tracer.incrementCurrentSourceLine();
         }
       }
@@ -151,6 +152,7 @@ public class SwitchStatement extends Statement {
     return buf;
   }
 
+  @Override
   public void initExprents() {
     SwitchExprent swexpr = (SwitchExprent)first.getExprents().remove(first.getExprents().size() - 1);
     swexpr.setCaseValues(caseValues);
@@ -158,20 +160,23 @@ public class SwitchStatement extends Statement {
     headexprent.set(0, swexpr);
   }
 
+  @Override
   public List<Object> getSequentialObjects() {
 
-    List<Object> lst = new ArrayList<Object>(stats);
+    List<Object> lst = new ArrayList<>(stats);
     lst.add(1, headexprent.get(0));
 
     return lst;
   }
 
+  @Override
   public void replaceExprent(Exprent oldexpr, Exprent newexpr) {
     if (headexprent.get(0) == oldexpr) {
       headexprent.set(0, newexpr);
     }
   }
 
+  @Override
   public void replaceStatement(Statement oldstat, Statement newstat) {
 
     for (int i = 0; i < caseStatements.size(); i++) {
@@ -183,10 +188,12 @@ public class SwitchStatement extends Statement {
     super.replaceStatement(oldstat, newstat);
   }
 
+  @Override
   public Statement getSimpleCopy() {
     return new SwitchStatement();
   }
 
+  @Override
   public void initSimpleCopy() {
     first = stats.get(0);
     default_edge = first.getSuccessorEdges(Statement.STATEDGE_DIRECT_ALL).get(0);
@@ -200,7 +207,7 @@ public class SwitchStatement extends Statement {
 
   public void sortEdgesAndNodes() {
 
-    HashMap<StatEdge, Integer> mapEdgeIndex = new HashMap<StatEdge, Integer>();
+    HashMap<StatEdge, Integer> mapEdgeIndex = new HashMap<>();
 
     List<StatEdge> lstFirstSuccs = first.getSuccessorEdges(STATEDGE_DIRECT_ALL);
     for (int i = 0; i < lstFirstSuccs.size(); i++) {
@@ -211,15 +218,15 @@ public class SwitchStatement extends Statement {
     BasicBlockStatement bbstat = (BasicBlockStatement)first;
     int[] values = ((SwitchInstruction)bbstat.getBlock().getLastInstruction()).getValues();
 
-    List<Statement> nodes = new ArrayList<Statement>();
-    List<List<Integer>> edges = new ArrayList<List<Integer>>();
+    List<Statement> nodes = new ArrayList<>(stats.size() - 1);
+    List<List<Integer>> edges = new ArrayList<>(stats.size() - 1);
 
     // collect regular edges
     for (int i = 1; i < stats.size(); i++) {
 
       Statement stat = stats.get(i);
 
-      List<Integer> lst = new ArrayList<Integer>();
+      List<Integer> lst = new ArrayList<>();
       for (StatEdge edge : stat.getPredecessorEdges(StatEdge.TYPE_REGULAR)) {
         if (edge.getSource() == first) {
           lst.add(mapEdgeIndex.get(edge));
@@ -236,7 +243,7 @@ public class SwitchStatement extends Statement {
     while (!lstExitEdges.isEmpty()) {
       StatEdge edge = lstExitEdges.get(0);
 
-      List<Integer> lst = new ArrayList<Integer>();
+      List<Integer> lst = new ArrayList<>();
       for (int i = lstExitEdges.size() - 1; i >= 0; i--) {
         StatEdge edgeTemp = lstExitEdges.get(i);
         if (edgeTemp.getDestination() == edge.getDestination() && edgeTemp.getType() == edge.getType()) {
@@ -265,7 +272,7 @@ public class SwitchStatement extends Statement {
       Statement stat = nodes.get(index);
 
       if (stat != null) {
-        HashSet<Statement> setPreds = new HashSet<Statement>(stat.getNeighbours(StatEdge.TYPE_REGULAR, DIRECTION_BACKWARD));
+        HashSet<Statement> setPreds = new HashSet<>(stat.getNeighbours(StatEdge.TYPE_REGULAR, DIRECTION_BACKWARD));
         setPreds.remove(first);
 
         if (!setPreds.isEmpty()) {
@@ -293,12 +300,12 @@ public class SwitchStatement extends Statement {
     }
 
     // translate indices back into edges
-    List<List<StatEdge>> lstEdges = new ArrayList<List<StatEdge>>();
-    List<List<ConstExprent>> lstValues = new ArrayList<List<ConstExprent>>();
+    List<List<StatEdge>> lstEdges = new ArrayList<>(edges.size());
+    List<List<Exprent>> lstValues = new ArrayList<>(edges.size());
 
     for (List<Integer> lst : edges) {
-      List<StatEdge> lste = new ArrayList<StatEdge>();
-      List<ConstExprent> lstv = new ArrayList<ConstExprent>();
+      List<StatEdge> lste = new ArrayList<>(lst.size());
+      List<Exprent> lstv = new ArrayList<>(lst.size());
 
       List<StatEdge> lstSuccs = first.getSuccessorEdges(STATEDGE_DIRECT_ALL);
       for (Integer in : lst) {
@@ -362,7 +369,7 @@ public class SwitchStatement extends Statement {
     return default_edge;
   }
 
-  public List<List<ConstExprent>> getCaseValues() {
+  public List<List<Exprent>> getCaseValues() {
     return caseValues;
   }
 }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
index b71531f..bc56583 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
@@ -1,28 +1,14 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.stats;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.code.cfg.BasicBlock;
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 import org.jetbrains.java.decompiler.modules.decompiler.SequenceHelper;
 import org.jetbrains.java.decompiler.modules.decompiler.StatEdge;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
+import org.jetbrains.java.decompiler.util.TextBuffer;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,7 +18,7 @@ public class SynchronizedStatement extends Statement {
 
   private Statement body;
 
-  private final List<Exprent> headexprent = new ArrayList<Exprent>();
+  private final List<Exprent> headexprent = new ArrayList<>(1);
 
   // *****************************************************************************
   // constructors
@@ -70,6 +56,7 @@ public class SynchronizedStatement extends Statement {
   // public methods
   // *****************************************************************************
 
+  @Override
   public TextBuffer toJava(int indent, BytecodeMappingTracer tracer) {
     TextBuffer buf = new TextBuffer();
     buf.append(ExprProcessor.listToJava(varDefinitions, indent, tracer));
@@ -100,24 +87,28 @@ public class SynchronizedStatement extends Statement {
     }
   }
 
+  @Override
   public void initExprents() {
     headexprent.set(0, first.getExprents().remove(first.getExprents().size() - 1));
   }
 
+  @Override
   public List<Object> getSequentialObjects() {
 
-    List<Object> lst = new ArrayList<Object>(stats);
+    List<Object> lst = new ArrayList<>(stats);
     lst.add(1, headexprent.get(0));
 
     return lst;
   }
 
+  @Override
   public void replaceExprent(Exprent oldexpr, Exprent newexpr) {
     if (headexprent.get(0) == oldexpr) {
       headexprent.set(0, newexpr);
     }
   }
 
+  @Override
   public void replaceStatement(Statement oldstat, Statement newstat) {
 
     if (body == oldstat) {
@@ -134,10 +125,12 @@ public class SynchronizedStatement extends Statement {
     stats.removeWithKey(exc.id);
   }
 
+  @Override
   public Statement getSimpleCopy() {
     return new SynchronizedStatement();
   }
 
+  @Override
   public void initSimpleCopy() {
     first = stats.get(0);
     body = stats.get(1);
@@ -151,15 +144,7 @@ public class SynchronizedStatement extends Statement {
     return body;
   }
 
-  public void setBody(Statement body) {
-    this.body = body;
-  }
-
   public List<Exprent> getHeadexprentList() {
     return headexprent;
   }
-
-  public Exprent getHeadexprent() {
-    return headexprent.get(0);
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java
index 12bcc32..f668aa7 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
@@ -22,17 +8,15 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class CheckTypesResult {
-
-  private final List<ExprentTypePair> lstMaxTypeExprents = new ArrayList<ExprentTypePair>();
-
-  private final List<ExprentTypePair> lstMinTypeExprents = new ArrayList<ExprentTypePair>();
+  private final List<ExprentTypePair> lstMaxTypeExprents = new ArrayList<>();
+  private final List<ExprentTypePair> lstMinTypeExprents = new ArrayList<>();
 
   public void addMaxTypeExprent(Exprent exprent, VarType type) {
-    lstMaxTypeExprents.add(new ExprentTypePair(exprent, type, null));
+    lstMaxTypeExprents.add(new ExprentTypePair(exprent, type));
   }
 
   public void addMinTypeExprent(Exprent exprent, VarType type) {
-    lstMinTypeExprents.add(new ExprentTypePair(exprent, type, null));
+    lstMinTypeExprents.add(new ExprentTypePair(exprent, type));
   }
 
   public List<ExprentTypePair> getLstMaxTypeExprents() {
@@ -46,12 +30,10 @@ public class CheckTypesResult {
   public static class ExprentTypePair {
     public final Exprent exprent;
     public final VarType type;
-    public final VarType desttype;
 
-    public ExprentTypePair(Exprent exprent, VarType type, VarType desttype) {
+    public ExprentTypePair(Exprent exprent, VarType type) {
       this.exprent = exprent;
       this.type = type;
-      this.desttype = desttype;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
index 23b1c5e..0402097 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -45,13 +31,13 @@ public class VarDefinitionHelper {
 
   public VarDefinitionHelper(Statement root, StructMethod mt, VarProcessor varproc) {
 
-    mapVarDefStatements = new HashMap<Integer, Statement>();
-    mapStatementVars = new HashMap<Integer, HashSet<Integer>>();
-    implDefVars = new HashSet<Integer>();
+    mapVarDefStatements = new HashMap<>();
+    mapStatementVars = new HashMap<>();
+    implDefVars = new HashSet<>();
 
     this.varproc = varproc;
 
-    VarNamesCollector vc = DecompilerContext.getVarNamesCollector();
+    VarNamesCollector vc = varproc.getVarNamesCollector();
 
     boolean thisvar = !mt.hasModifier(CodeConstants.ACC_STATIC);
 
@@ -92,7 +78,7 @@ public class VarDefinitionHelper {
     }
 
     // catch variables are implicitly defined
-    LinkedList<Statement> stack = new LinkedList<Statement>();
+    LinkedList<Statement> stack = new LinkedList<>();
     stack.add(root);
 
     while (!stack.isEmpty()) {
@@ -122,8 +108,7 @@ public class VarDefinitionHelper {
 
 
   public void setVarDefinitions() {
-
-    VarNamesCollector vc = DecompilerContext.getVarNamesCollector();
+    VarNamesCollector vc = varproc.getVarNamesCollector();
 
     for (Entry<Integer, Statement> en : mapVarDefStatements.entrySet()) {
       Statement stat = en.getValue();
@@ -147,7 +132,7 @@ public class VarDefinitionHelper {
           else {
             List<Exprent> lstSpecial = Arrays.asList(dstat.getConditionExprent(), dstat.getIncExprent());
             for (VarExprent var : getAllVars(lstSpecial)) {
-              if (var.getIndex() == index.intValue()) {
+              if (var.getIndex() == index) {
                 stat = stat.getParent();
                 break;
               }
@@ -173,7 +158,7 @@ public class VarDefinitionHelper {
 
       boolean defset = false;
 
-      // search for the first assignement to var [index]
+      // search for the first assignment to var [index]
       int addindex = 0;
       for (Exprent expr : lst) {
         if (setDefinition(expr, index)) {
@@ -196,7 +181,7 @@ public class VarDefinitionHelper {
       }
 
       if (!defset) {
-        VarExprent var = new VarExprent(index.intValue(), varproc.getVarType(new VarVersionPair(index.intValue(), 0)), varproc);
+        VarExprent var = new VarExprent(index, varproc.getVarType(new VarVersionPair(index.intValue(), 0)), varproc);
         var.setDefinition(true);
 
         lst.add(addindex, var);
@@ -211,7 +196,7 @@ public class VarDefinitionHelper {
 
   private Statement findFirstBlock(Statement stat, Integer varindex) {
 
-    LinkedList<Statement> stack = new LinkedList<Statement>();
+    LinkedList<Statement> stack = new LinkedList<>();
     stack.add(stat);
 
     while (!stack.isEmpty()) {
@@ -251,15 +236,15 @@ public class VarDefinitionHelper {
 
   private Set<Integer> initStatement(Statement stat) {
 
-    HashMap<Integer, Integer> mapCount = new HashMap<Integer, Integer>();
+    HashMap<Integer, Integer> mapCount = new HashMap<>();
 
     List<VarExprent> condlst;
 
     if (stat.getExprents() == null) {
 
       // recurse on children statements
-      List<Integer> childVars = new ArrayList<Integer>();
-      List<Exprent> currVars = new ArrayList<Exprent>();
+      List<Integer> childVars = new ArrayList<>();
+      List<Exprent> currVars = new ArrayList<>();
 
       for (Object obj : stat.getSequentialObjects()) {
         if (obj instanceof Statement) {
@@ -289,9 +274,9 @@ public class VarDefinitionHelper {
       for (Integer index : childVars) {
         Integer count = mapCount.get(index);
         if (count == null) {
-          count = new Integer(0);
+          count = 0;
         }
-        mapCount.put(index, new Integer(count.intValue() + 1));
+        mapCount.put(index, count + 1);
       }
 
       condlst = getAllVars(currVars);
@@ -302,15 +287,15 @@ public class VarDefinitionHelper {
 
     // this statement
     for (VarExprent var : condlst) {
-      mapCount.put(new Integer(var.getIndex()), new Integer(2));
+      mapCount.put(var.getIndex(), 2);
     }
 
 
-    HashSet<Integer> set = new HashSet<Integer>(mapCount.keySet());
+    HashSet<Integer> set = new HashSet<>(mapCount.keySet());
 
     // put all variables defined in this statement into the set
     for (Entry<Integer, Integer> en : mapCount.entrySet()) {
-      if (en.getValue().intValue() > 1) {
+      if (en.getValue() > 1) {
         mapVarDefStatements.put(en.getKey(), stat);
       }
     }
@@ -322,8 +307,8 @@ public class VarDefinitionHelper {
 
   private static List<VarExprent> getAllVars(List<Exprent> lst) {
 
-    List<VarExprent> res = new ArrayList<VarExprent>();
-    List<Exprent> listTemp = new ArrayList<Exprent>();
+    List<VarExprent> res = new ArrayList<>();
+    List<Exprent> listTemp = new ArrayList<>();
 
     for (Exprent expr : lst) {
       listTemp.addAll(expr.getAllExprents(true));
@@ -344,7 +329,7 @@ public class VarDefinitionHelper {
       Exprent left = ((AssignmentExprent)expr).getLeft();
       if (left.type == Exprent.EXPRENT_VAR) {
         VarExprent var = (VarExprent)left;
-        if (var.getIndex() == index.intValue()) {
+        if (var.getIndex() == index) {
           var.setDefinition(true);
           return true;
         }
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
index ce81474..9999b50 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
@@ -1,47 +1,40 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
-import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.collectors.VarNamesCollector;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
 import org.jetbrains.java.decompiler.struct.StructMethod;
+import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
+import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.*;
 import java.util.Map.Entry;
 
 public class VarProcessor {
-
-  private Map<VarVersionPair, String> mapVarNames = new HashMap<VarVersionPair, String>();
+  private final VarNamesCollector varNamesCollector = new VarNamesCollector();
+  private final StructMethod method;
+  private final MethodDescriptor methodDescriptor;
+  private Map<VarVersionPair, String> mapVarNames = new HashMap<>();
   private VarVersionsProcessor varVersions;
-  private final Map<VarVersionPair, String> thisVars = new HashMap<VarVersionPair, String>();
-  private final Set<VarVersionPair> externalVars = new HashSet<VarVersionPair>();
+  private final Map<VarVersionPair, String> thisVars = new HashMap<>();
+  private final Set<VarVersionPair> externalVars = new HashSet<>();
+
+  public VarProcessor(StructMethod mt, MethodDescriptor md) {
+    method = mt;
+    methodDescriptor = md;
+  }
 
   public void setVarVersions(RootStatement root) {
-    varVersions = new VarVersionsProcessor();
-    varVersions.setVarVersions(root);
+    VarVersionsProcessor oldProcessor = varVersions;
+    varVersions = new VarVersionsProcessor(method, methodDescriptor);
+    varVersions.setVarVersions(root, oldProcessor);
   }
 
   public void setVarDefinitions(Statement root) {
-    mapVarNames = new HashMap<VarVersionPair, String>();
-
-    StructMethod mt = (StructMethod)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD);
-    new VarDefinitionHelper(root, mt, this).setVarDefinitions();
+    mapVarNames = new HashMap<>();
+    new VarDefinitionHelper(root, method, this).setVarDefinitions();
   }
 
   public void setDebugVarNames(Map<Integer, String> mapDebugVarNames) {
@@ -51,26 +44,24 @@ public class VarProcessor {
 
     Map<Integer, Integer> mapOriginalVarIndices = varVersions.getMapOriginalVarIndices();
 
-    List<VarVersionPair> listVars = new ArrayList<VarVersionPair>(mapVarNames.keySet());
-    Collections.sort(listVars, new Comparator<VarVersionPair>() {
-      @Override
-      public int compare(VarVersionPair o1, VarVersionPair o2) {
-        return o1.var - o2.var;
-      }
-    });
+    List<VarVersionPair> listVars = new ArrayList<>(mapVarNames.keySet());
+    listVars.sort(Comparator.comparingInt(o -> o.var));
 
-    Map<String, Integer> mapNames = new HashMap<String, Integer>();
+    Map<String, Integer> mapNames = new HashMap<>();
 
     for (VarVersionPair pair : listVars) {
       String name = mapVarNames.get(pair);
 
       Integer index = mapOriginalVarIndices.get(pair.var);
-      if (index != null && mapDebugVarNames.containsKey(index)) {
-        name = mapDebugVarNames.get(index);
+      if (index != null) {
+        String debugName = mapDebugVarNames.get(index);
+        if (debugName != null && TextUtil.isValidIdentifier(debugName, method.getClassStruct().getBytecodeVersion())) {
+          name = debugName;
+        }
       }
 
       Integer counter = mapNames.get(name);
-      mapNames.put(name, counter == null ? counter = new Integer(0) : ++counter);
+      mapNames.put(name, counter == null ? counter = 0 : ++counter);
 
       if (counter > 0) {
         name += String.valueOf(counter);
@@ -80,13 +71,25 @@ public class VarProcessor {
     }
   }
 
+  public Integer getVarOriginalIndex(int index) {
+    if (varVersions == null) {
+      return null;
+    }
+
+    return varVersions.getMapOriginalVarIndices().get(index);
+  }
+
   public void refreshVarNames(VarNamesCollector vc) {
-    Map<VarVersionPair, String> tempVarNames = new HashMap<VarVersionPair, String>(mapVarNames);
+    Map<VarVersionPair, String> tempVarNames = new HashMap<>(mapVarNames);
     for (Entry<VarVersionPair, String> ent : tempVarNames.entrySet()) {
       mapVarNames.put(ent.getKey(), vc.getFreeName(ent.getValue()));
     }
   }
 
+  public VarNamesCollector getVarNamesCollector() {
+    return varNamesCollector;
+  }
+
   public VarType getVarType(VarVersionPair pair) {
     return varVersions == null ? null : varVersions.getVarType(pair);
   }
@@ -103,6 +106,10 @@ public class VarProcessor {
     mapVarNames.put(pair, name);
   }
 
+  public Collection<String> getVarNames() {
+    return mapVarNames != null ? mapVarNames.values() : Collections.emptySet();
+  }
+
   public int getVarFinal(VarVersionPair pair) {
     return varVersions == null ? VarTypeProcessor.VAR_FINAL : varVersions.getVarFinal(pair);
   }
@@ -118,4 +125,4 @@ public class VarProcessor {
   public Set<VarVersionPair> getExternalVars() {
     return externalVars;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
index d6c746b..3c19d2c 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -34,21 +20,34 @@ import java.util.List;
 import java.util.Map;
 
 public class VarTypeProcessor {
-
   public static final int VAR_NON_FINAL = 1;
   public static final int VAR_EXPLICIT_FINAL = 2;
   public static final int VAR_FINAL = 3;
 
-  private final Map<VarVersionPair, VarType> mapExprentMinTypes = new HashMap<VarVersionPair, VarType>();
-  private final Map<VarVersionPair, VarType> mapExprentMaxTypes = new HashMap<VarVersionPair, VarType>();
-  private final Map<VarVersionPair, Integer> mapFinalVars = new HashMap<VarVersionPair, Integer>();
+  private final StructMethod method;
+  private final MethodDescriptor methodDescriptor;
+  private final Map<VarVersionPair, VarType> mapExprentMinTypes = new HashMap<>();
+  private final Map<VarVersionPair, VarType> mapExprentMaxTypes = new HashMap<>();
+  private final Map<VarVersionPair, Integer> mapFinalVars = new HashMap<>();
+
+  public VarTypeProcessor(StructMethod mt, MethodDescriptor md) {
+    method = mt;
+    methodDescriptor = md;
+  }
+
+  public void calculateVarTypes(RootStatement root, DirectGraph graph) {
+    setInitVars(root);
+
+    resetExprentTypes(graph);
+
+    //noinspection StatementWithEmptyBody
+    while (!processVarTypes(graph)) ;
+  }
 
   private void setInitVars(RootStatement root) {
-    StructMethod mt = (StructMethod)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD);
+    boolean thisVar = !method.hasModifier(CodeConstants.ACC_STATIC);
 
-    boolean thisVar = !mt.hasModifier(CodeConstants.ACC_STATIC);
-
-    MethodDescriptor md = (MethodDescriptor)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD_DESCRIPTOR);
+    MethodDescriptor md = methodDescriptor;
 
     if (thisVar) {
       StructClass cl = (StructClass)DecompilerContext.getProperty(DecompilerContext.CURRENT_CLASS);
@@ -65,7 +64,7 @@ public class VarTypeProcessor {
     }
 
     // catch variables
-    LinkedList<Statement> stack = new LinkedList<Statement>();
+    LinkedList<Statement> stack = new LinkedList<>();
     stack.add(root);
 
     while (!stack.isEmpty()) {
@@ -90,45 +89,28 @@ public class VarTypeProcessor {
     }
   }
 
-  public void calculateVarTypes(RootStatement root, DirectGraph graph) {
-    setInitVars(root);
-
-    resetExprentTypes(graph);
-
-    //noinspection StatementWithEmptyBody
-    while (!processVarTypes(graph)) ;
-  }
-
   private static void resetExprentTypes(DirectGraph graph) {
-    graph.iterateExprents(new DirectGraph.ExprentIterator() {
-      @Override
-      public int processExprent(Exprent exprent) {
-        List<Exprent> lst = exprent.getAllExprents(true);
-        lst.add(exprent);
+    graph.iterateExprents(exprent -> {
+      List<Exprent> lst = exprent.getAllExprents(true);
+      lst.add(exprent);
 
-        for (Exprent expr : lst) {
-          if (expr.type == Exprent.EXPRENT_VAR) {
-            ((VarExprent)expr).setVarType(VarType.VARTYPE_UNKNOWN);
-          }
-          else if (expr.type == Exprent.EXPRENT_CONST) {
-            ConstExprent constExpr = (ConstExprent)expr;
-            if (constExpr.getConstType().typeFamily == CodeConstants.TYPE_FAMILY_INTEGER) {
-              constExpr.setConstType(new ConstExprent(constExpr.getIntValue(), constExpr.isBoolPermitted(), null).getConstType());
-            }
+      for (Exprent expr : lst) {
+        if (expr.type == Exprent.EXPRENT_VAR) {
+          ((VarExprent)expr).setVarType(VarType.VARTYPE_UNKNOWN);
+        }
+        else if (expr.type == Exprent.EXPRENT_CONST) {
+          ConstExprent constExpr = (ConstExprent)expr;
+          if (constExpr.getConstType().typeFamily == CodeConstants.TYPE_FAMILY_INTEGER) {
+            constExpr.setConstType(new ConstExprent(constExpr.getIntValue(), constExpr.isBoolPermitted(), null).getConstType());
           }
         }
-        return 0;
       }
+      return 0;
     });
   }
 
   private boolean processVarTypes(DirectGraph graph) {
-    return graph.iterateExprents(new DirectGraph.ExprentIterator() {
-      @Override
-      public int processExprent(Exprent exprent) {
-        return checkTypeExprent(exprent) ? 0 : 1;
-      }
-    });
+    return graph.iterateExprents(exprent -> checkTypeExprent(exprent) ? 0 : 1);
   }
 
   private boolean checkTypeExprent(Exprent exprent) {
@@ -151,15 +133,17 @@ public class VarTypeProcessor {
 
     CheckTypesResult result = exprent.checkExprTypeBounds();
 
-    for (CheckTypesResult.ExprentTypePair entry : result.getLstMaxTypeExprents()) {
-      if (entry.type.typeFamily != CodeConstants.TYPE_FAMILY_OBJECT) {
-        changeExprentType(entry.exprent, entry.type, 1);
-      }
-    }
-
     boolean res = true;
-    for (CheckTypesResult.ExprentTypePair entry : result.getLstMinTypeExprents()) {
-      res &= changeExprentType(entry.exprent, entry.type, 0);
+    if (result != null) {
+      for (CheckTypesResult.ExprentTypePair entry : result.getLstMaxTypeExprents()) {
+        if (entry.type.typeFamily != CodeConstants.TYPE_FAMILY_OBJECT) {
+          changeExprentType(entry.exprent, entry.type, 1);
+        }
+      }
+
+      for (CheckTypesResult.ExprentTypePair entry : result.getLstMinTypeExprents()) {
+        res &= changeExprentType(entry.exprent, entry.type, 0);
+      }
     }
 
     return res;
@@ -189,7 +173,6 @@ public class VarTypeProcessor {
           pair = new VarVersionPair(((ConstExprent)exprent).id, -1);
         }
         else if (exprent.type == Exprent.EXPRENT_VAR) {
-          //noinspection ConstantConditions
           pair = new VarVersionPair((VarExprent)exprent);
         }
 
@@ -208,7 +191,6 @@ public class VarTypeProcessor {
 
           mapExprentMinTypes.put(pair, newMinType);
           if (exprent.type == Exprent.EXPRENT_CONST) {
-            //noinspection ConstantConditions
             ((ConstExprent)exprent).setConstType(newMinType);
           }
 
@@ -274,4 +256,4 @@ public class VarTypeProcessor {
   public VarType getVarType(VarVersionPair pair) {
     return mapExprentMinTypes.get(pair);
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java
index a871fec..2e67a88 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java
@@ -1,21 +1,7 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
-public class VarVersionEdge { // FIXME: can be removed? 
+public class VarVersionEdge { // FIXME: can be removed?
 
   public static final int EDGE_GENERAL = 0;
   public static final int EDGE_PHANTOM = 1;
@@ -38,7 +24,7 @@ public class VarVersionEdge { // FIXME: can be removed?
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof VarVersionEdge)) return false;
+    if (!(o instanceof VarVersionEdge)) return false;
 
     VarVersionEdge edge = (VarVersionEdge)o;
     return type == edge.type && source == edge.source && dest == edge.dest;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
index 9b57833..914995e 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
 import org.jetbrains.java.decompiler.modules.decompiler.decompose.IGraphNode;
@@ -31,9 +17,9 @@ public class VarVersionNode implements IGraphNode {
 
   public final int version;
 
-  public final Set<VarVersionEdge> succs = new HashSet<VarVersionEdge>();
+  public final Set<VarVersionEdge> succs = new HashSet<>();
 
-  public final Set<VarVersionEdge> preds = new HashSet<VarVersionEdge>();
+  public final Set<VarVersionEdge> preds = new HashSet<>();
 
   public int flags;
 
@@ -45,12 +31,9 @@ public class VarVersionNode implements IGraphNode {
     this.version = version;
   }
 
-  public VarVersionPair getVarPaar() {
-    return new VarVersionPair(var, version);
-  }
-
+  @Override
   public List<IGraphNode> getPredecessors() {
-    List<IGraphNode> lst = new ArrayList<IGraphNode>(preds.size());
+    List<IGraphNode> lst = new ArrayList<>(preds.size());
     for (VarVersionEdge edge : preds) {
       lst.add(edge.source);
     }
@@ -77,4 +60,4 @@ public class VarVersionNode implements IGraphNode {
   public String toString() {
     return "(" + var + "_" + version + ")";
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java
index ab9e5d4..8554988 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPair.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
@@ -30,8 +16,8 @@ public class VarVersionPair {
   }
 
   public VarVersionPair(Integer var, Integer version) {
-    this.var = var.intValue();
-    this.version = version.intValue();
+    this.var = var;
+    this.version = version;
   }
 
   public VarVersionPair(VarExprent var) {
@@ -42,7 +28,7 @@ public class VarVersionPair {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof VarVersionPair)) return false;
+    if (!(o instanceof VarVersionPair)) return false;
 
     VarVersionPair paar = (VarVersionPair)o;
     return var == paar.var && version == paar.version;
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
index 8cc11fa..58eda68 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
 import org.jetbrains.java.decompiler.modules.decompiler.decompose.GenericDominatorEngine;
@@ -22,12 +8,8 @@ import org.jetbrains.java.decompiler.util.VBStyleCollection;
 
 import java.util.*;
 
-
 public class VarVersionsGraph {
-
-  public int counter = 0;
-
-  public final VBStyleCollection<VarVersionNode, VarVersionPair> nodes = new VBStyleCollection<VarVersionNode, VarVersionPair>();
+  public final VBStyleCollection<VarVersionNode, VarVersionPair> nodes = new VBStyleCollection<>();
 
   private GenericDominatorEngine engine;
 
@@ -41,24 +23,21 @@ public class VarVersionsGraph {
     nodes.addAllWithKey(colnodes, colpaars);
   }
 
-  public boolean isDominatorSet(VarVersionNode node, HashSet<VarVersionNode> domnodes) {
-
+  public boolean isDominatorSet(VarVersionNode node, Set<VarVersionNode> domnodes) {
     if (domnodes.size() == 1) {
       return engine.isDominator(node, domnodes.iterator().next());
     }
     else {
-
-      HashSet<VarVersionNode> marked = new HashSet<VarVersionNode>();
+      Set<VarVersionNode> marked = new HashSet<>();
 
       if (domnodes.contains(node)) {
         return true;
       }
 
-      LinkedList<VarVersionNode> lstNodes = new LinkedList<VarVersionNode>();
+      List<VarVersionNode> lstNodes = new LinkedList<>();
       lstNodes.add(node);
 
       while (!lstNodes.isEmpty()) {
-
         VarVersionNode nd = lstNodes.remove(0);
         if (marked.contains(nd)) {
           continue;
@@ -84,8 +63,7 @@ public class VarVersionsGraph {
   }
 
   public void initDominators() {
-
-    final HashSet<VarVersionNode> roots = new HashSet<VarVersionNode>();
+    Set<VarVersionNode> roots = new HashSet<>();
 
     for (VarVersionNode node : nodes) {
       if (node.preds.isEmpty()) {
@@ -94,10 +72,12 @@ public class VarVersionsGraph {
     }
 
     engine = new GenericDominatorEngine(new IGraph() {
+      @Override
       public List<? extends IGraphNode> getReversePostOrderList() {
         return getReversedPostOrder(roots);
       }
 
+      @Override
       public Set<? extends IGraphNode> getRoots() {
         return new HashSet<IGraphNode>(roots);
       }
@@ -106,62 +86,49 @@ public class VarVersionsGraph {
     engine.initialize();
   }
 
-  private static LinkedList<VarVersionNode> getReversedPostOrder(Collection<VarVersionNode> roots) {
-
-    LinkedList<VarVersionNode> lst = new LinkedList<VarVersionNode>();
-    HashSet<VarVersionNode> setVisited = new HashSet<VarVersionNode>();
+  private static List<VarVersionNode> getReversedPostOrder(Collection<VarVersionNode> roots) {
+    List<VarVersionNode> lst = new LinkedList<>();
+    Set<VarVersionNode> setVisited = new HashSet<>();
 
     for (VarVersionNode root : roots) {
-
-      LinkedList<VarVersionNode> lstTemp = new LinkedList<VarVersionNode>();
+      List<VarVersionNode> lstTemp = new LinkedList<>();
       addToReversePostOrderListIterative(root, lstTemp, setVisited);
-
       lst.addAll(lstTemp);
     }
 
     return lst;
   }
 
-  private static void addToReversePostOrderListIterative(VarVersionNode root, List<VarVersionNode> lst, HashSet<VarVersionNode> setVisited) {
-
-    HashMap<VarVersionNode, List<VarVersionEdge>> mapNodeSuccs = new HashMap<VarVersionNode, List<VarVersionEdge>>();
-
-    LinkedList<VarVersionNode> stackNode = new LinkedList<VarVersionNode>();
-    LinkedList<Integer> stackIndex = new LinkedList<Integer>();
+  private static void addToReversePostOrderListIterative(VarVersionNode root, List<? super VarVersionNode> lst, Set<? super VarVersionNode> setVisited) {
+    Map<VarVersionNode, List<VarVersionEdge>> mapNodeSuccs = new HashMap<>();
+    LinkedList<VarVersionNode> stackNode = new LinkedList<>();
+    LinkedList<Integer> stackIndex = new LinkedList<>();
 
     stackNode.add(root);
     stackIndex.add(0);
 
     while (!stackNode.isEmpty()) {
-
       VarVersionNode node = stackNode.getLast();
       int index = stackIndex.removeLast();
 
       setVisited.add(node);
 
-      List<VarVersionEdge> lstSuccs = mapNodeSuccs.get(node);
-      if (lstSuccs == null) {
-        mapNodeSuccs.put(node, lstSuccs = new ArrayList<VarVersionEdge>(node.succs));
-      }
-
+      List<VarVersionEdge> lstSuccs = mapNodeSuccs.computeIfAbsent(node, n -> new ArrayList<>(n.succs));
       for (; index < lstSuccs.size(); index++) {
         VarVersionNode succ = lstSuccs.get(index).dest;
 
         if (!setVisited.contains(succ)) {
           stackIndex.add(index + 1);
-
           stackNode.add(succ);
           stackIndex.add(0);
-
           break;
         }
       }
 
       if (index == lstSuccs.size()) {
         lst.add(0, node);
-
         stackNode.removeLast();
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
index 31f0f86..adbb6fd 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.decompiler.vars;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -26,6 +12,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.sforms.FlattenStatements
 import org.jetbrains.java.decompiler.modules.decompiler.sforms.SSAConstructorSparseEx;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 import org.jetbrains.java.decompiler.struct.StructMethod;
+import org.jetbrains.java.decompiler.struct.gen.MethodDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.util.FastSparseSetFactory.FastSparseSet;
 
@@ -33,38 +20,40 @@ import java.util.*;
 import java.util.Map.Entry;
 
 public class VarVersionsProcessor {
+  private final StructMethod method;
+  private Map<Integer, Integer> mapOriginalVarIndices = Collections.emptyMap();
+  private final VarTypeProcessor typeProcessor;
 
-  private Map<Integer, Integer> mapOriginalVarIndices = new HashMap<Integer, Integer>();
-  private VarTypeProcessor typeProcessor;
-
-  public void setVarVersions(RootStatement root) {
-    StructMethod mt = (StructMethod)DecompilerContext.getProperty(DecompilerContext.CURRENT_METHOD);
+  public VarVersionsProcessor(StructMethod mt, MethodDescriptor md) {
+    method = mt;
+    typeProcessor = new VarTypeProcessor(mt, md);
+  }
 
+  public void setVarVersions(RootStatement root, VarVersionsProcessor previousVersionsProcessor) {
     SSAConstructorSparseEx ssa = new SSAConstructorSparseEx();
-    ssa.splitVariables(root, mt);
+    ssa.splitVariables(root, method);
 
     FlattenStatementsHelper flattenHelper = new FlattenStatementsHelper();
     DirectGraph graph = flattenHelper.buildDirectGraph(root);
 
     mergePhiVersions(ssa, graph);
 
-    typeProcessor = new VarTypeProcessor();
     typeProcessor.calculateVarTypes(root, graph);
 
-    simpleMerge(typeProcessor, graph, mt);
+    simpleMerge(typeProcessor, graph, method);
 
     // FIXME: advanced merging
 
     eliminateNonJavaTypes(typeProcessor);
 
-    setNewVarIndices(typeProcessor, graph);
+    setNewVarIndices(typeProcessor, graph, previousVersionsProcessor);
   }
 
   private static void mergePhiVersions(SSAConstructorSparseEx ssa, DirectGraph graph) {
     // collect phi versions
-    List<Set<VarVersionPair>> lst = new ArrayList<Set<VarVersionPair>>();
+    List<Set<VarVersionPair>> lst = new ArrayList<>();
     for (Entry<VarVersionPair, FastSparseSet<Integer>> ent : ssa.getPhi().entrySet()) {
-      Set<VarVersionPair> set = new HashSet<VarVersionPair>();
+      Set<VarVersionPair> set = new HashSet<>();
       set.add(ent.getKey());
       for (Integer version : ent.getValue()) {
         set.add(new VarVersionPair(ent.getKey().var, version.intValue()));
@@ -72,7 +61,7 @@ public class VarVersionsProcessor {
 
       for (int i = lst.size() - 1; i >= 0; i--) {
         Set<VarVersionPair> tset = lst.get(i);
-        Set<VarVersionPair> intersection = new HashSet<VarVersionPair>(set);
+        Set<VarVersionPair> intersection = new HashSet<>(set);
         intersection.retainAll(tset);
 
         if (!intersection.isEmpty()) {
@@ -84,7 +73,7 @@ public class VarVersionsProcessor {
       lst.add(set);
     }
 
-    Map<VarVersionPair, Integer> phiVersions = new HashMap<VarVersionPair, Integer>();
+    Map<VarVersionPair, Integer> phiVersions = new HashMap<>();
     for (Set<VarVersionPair> set : lst) {
       int min = Integer.MAX_VALUE;
       for (VarVersionPair paar : set) {
@@ -102,24 +91,21 @@ public class VarVersionsProcessor {
   }
 
   private static void updateVersions(DirectGraph graph, final Map<VarVersionPair, Integer> versions) {
-    graph.iterateExprents(new DirectGraph.ExprentIterator() {
-      @Override
-      public int processExprent(Exprent exprent) {
-        List<Exprent> lst = exprent.getAllExprents(true);
-        lst.add(exprent);
+    graph.iterateExprents(exprent -> {
+      List<Exprent> lst = exprent.getAllExprents(true);
+      lst.add(exprent);
 
-        for (Exprent expr : lst) {
-          if (expr.type == Exprent.EXPRENT_VAR) {
-            VarExprent var = (VarExprent)expr;
-            Integer version = versions.get(new VarVersionPair(var));
-            if (version != null) {
-              var.setVersion(version);
-            }
+      for (Exprent expr : lst) {
+        if (expr.type == Exprent.EXPRENT_VAR) {
+          VarExprent var = (VarExprent)expr;
+          Integer version = versions.get(new VarVersionPair(var));
+          if (version != null) {
+            var.setVersion(version);
           }
         }
-
-        return 0;
       }
+
+      return 0;
     });
   }
 
@@ -127,8 +113,7 @@ public class VarVersionsProcessor {
     Map<VarVersionPair, VarType> mapExprentMaxTypes = typeProcessor.getMapExprentMaxTypes();
     Map<VarVersionPair, VarType> mapExprentMinTypes = typeProcessor.getMapExprentMinTypes();
 
-    Set<VarVersionPair> set = new HashSet<VarVersionPair>(mapExprentMinTypes.keySet());
-    for (VarVersionPair paar : set) {
+    for (VarVersionPair paar : new ArrayList<>(mapExprentMinTypes.keySet())) {
       VarType type = mapExprentMinTypes.get(paar);
       VarType maxType = mapExprentMaxTypes.get(paar);
 
@@ -153,27 +138,22 @@ public class VarVersionsProcessor {
     Map<VarVersionPair, VarType> mapExprentMaxTypes = typeProcessor.getMapExprentMaxTypes();
     Map<VarVersionPair, VarType> mapExprentMinTypes = typeProcessor.getMapExprentMinTypes();
 
-    Map<Integer, Set<Integer>> mapVarVersions = new HashMap<Integer, Set<Integer>>();
+    Map<Integer, Set<Integer>> mapVarVersions = new HashMap<>();
 
     for (VarVersionPair pair : mapExprentMinTypes.keySet()) {
       if (pair.version >= 0) {  // don't merge constants
-        Set<Integer> set = mapVarVersions.get(pair.var);
-        if (set == null) {
-          set = new HashSet<Integer>();
-          mapVarVersions.put(pair.var, set);
-        }
-        set.add(pair.version);
+        mapVarVersions.computeIfAbsent(pair.var, k -> new HashSet<>()).add(pair.version);
       }
     }
 
     boolean is_method_static = mt.hasModifier(CodeConstants.ACC_STATIC);
 
-    Map<VarVersionPair, Integer> mapMergedVersions = new HashMap<VarVersionPair, Integer>();
+    Map<VarVersionPair, Integer> mapMergedVersions = new HashMap<>();
 
     for (Entry<Integer, Set<Integer>> ent : mapVarVersions.entrySet()) {
 
       if (ent.getValue().size() > 1) {
-        List<Integer> lstVersions = new ArrayList<Integer>(ent.getValue());
+        List<Integer> lstVersions = new ArrayList<>(ent.getValue());
         Collections.sort(lstVersions);
 
         for (int i = 0; i < lstVersions.size(); i++) {
@@ -224,19 +204,18 @@ public class VarVersionsProcessor {
     }
   }
 
-  private void setNewVarIndices(VarTypeProcessor typeProcessor, DirectGraph graph) {
+  private void setNewVarIndices(VarTypeProcessor typeProcessor, DirectGraph graph, VarVersionsProcessor previousVersionsProcessor) {
     final Map<VarVersionPair, VarType> mapExprentMaxTypes = typeProcessor.getMapExprentMaxTypes();
     Map<VarVersionPair, VarType> mapExprentMinTypes = typeProcessor.getMapExprentMinTypes();
     Map<VarVersionPair, Integer> mapFinalVars = typeProcessor.getMapFinalVars();
 
     CounterContainer counters = DecompilerContext.getCounterContainer();
 
-    final Map<VarVersionPair, Integer> mapVarPaar = new HashMap<VarVersionPair, Integer>();
-    Map<Integer, Integer> mapOriginalVarIndices = new HashMap<Integer, Integer>();
+    final Map<VarVersionPair, Integer> mapVarPaar = new HashMap<>();
+    Map<Integer, Integer> mapOriginalVarIndices = new HashMap<>();
 
     // map var-version pairs on new var indexes
-    Set<VarVersionPair> set = new HashSet<VarVersionPair>(mapExprentMinTypes.keySet());
-    for (VarVersionPair pair : set) {
+    for (VarVersionPair pair : new ArrayList<>(mapExprentMinTypes.keySet())) {
 
       if (pair.version >= 0) {
         int newIndex = pair.version == 1 ? pair.var : counters.getCounterAndIncrement(CounterContainer.VAR_COUNTER);
@@ -256,38 +235,47 @@ public class VarVersionsProcessor {
     }
 
     // set new vars
-    graph.iterateExprents(new DirectGraph.ExprentIterator() {
-      @Override
-      public int processExprent(Exprent exprent) {
-        List<Exprent> lst = exprent.getAllExprents(true);
-        lst.add(exprent);
+    graph.iterateExprents(exprent -> {
+      List<Exprent> lst = exprent.getAllExprents(true);
+      lst.add(exprent);
 
-        for (Exprent expr : lst) {
-          if (expr.type == Exprent.EXPRENT_VAR) {
-            VarExprent newVar = (VarExprent)expr;
-            Integer newVarIndex = mapVarPaar.get(new VarVersionPair(newVar));
-            if (newVarIndex != null) {
-              newVar.setIndex(newVarIndex);
-              newVar.setVersion(0);
-            }
-          }
-          else if (expr.type == Exprent.EXPRENT_CONST) {
-            VarType maxType = mapExprentMaxTypes.get(new VarVersionPair(expr.id, -1));
-            if (maxType != null && maxType.equals(VarType.VARTYPE_CHAR)) {
-              ((ConstExprent)expr).setConstType(maxType);
-            }
+      for (Exprent expr : lst) {
+        if (expr.type == Exprent.EXPRENT_VAR) {
+          VarExprent newVar = (VarExprent)expr;
+          Integer newVarIndex = mapVarPaar.get(new VarVersionPair(newVar));
+          if (newVarIndex != null) {
+            newVar.setIndex(newVarIndex);
+            newVar.setVersion(0);
+          }
+        }
+        else if (expr.type == Exprent.EXPRENT_CONST) {
+          VarType maxType = mapExprentMaxTypes.get(new VarVersionPair(expr.id, -1));
+          if (maxType != null && maxType.equals(VarType.VARTYPE_CHAR)) {
+            ((ConstExprent)expr).setConstType(maxType);
           }
         }
-
-        return 0;
       }
+
+      return 0;
     });
 
-    this.mapOriginalVarIndices = mapOriginalVarIndices;
+    if (previousVersionsProcessor != null) {
+      Map<Integer, Integer> oldIndices = previousVersionsProcessor.getMapOriginalVarIndices();
+      this.mapOriginalVarIndices = new HashMap<>(mapOriginalVarIndices.size());
+      for (Entry<Integer, Integer> entry : mapOriginalVarIndices.entrySet()) {
+        Integer value = entry.getValue();
+        Integer oldValue = oldIndices.get(value);
+        value = oldValue != null ? oldValue : value;
+        this.mapOriginalVarIndices.put(entry.getKey(), value);
+      }
+    }
+    else {
+      this.mapOriginalVarIndices = mapOriginalVarIndices;
+    }
   }
 
   public VarType getVarType(VarVersionPair pair) {
-    return typeProcessor == null ? null : typeProcessor.getVarType(pair);
+    return typeProcessor.getVarType(pair);
   }
 
   public void setVarType(VarVersionPair pair, VarType type) {
@@ -295,13 +283,8 @@ public class VarVersionsProcessor {
   }
 
   public int getVarFinal(VarVersionPair pair) {
-    int ret = VarTypeProcessor.VAR_FINAL;
-    if (typeProcessor != null) {
-      Integer fin = typeProcessor.getMapFinalVars().get(pair);
-      ret = fin == null ? VarTypeProcessor.VAR_FINAL : fin.intValue();
-    }
-
-    return ret;
+    Integer fin = typeProcessor.getMapFinalVars().get(pair);
+    return fin == null ? VarTypeProcessor.VAR_FINAL : fin;
   }
 
   public void setVarFinal(VarVersionPair pair, int finalType) {
@@ -311,4 +294,4 @@ public class VarVersionsProcessor {
   public Map<Integer, Integer> getMapOriginalVarIndices() {
     return mapOriginalVarIndices;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java b/src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java
index 566508b..714b4af 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.renamer;
 
 import org.jetbrains.java.decompiler.struct.StructClass;
@@ -21,19 +7,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ClassWrapperNode {
-
   private final StructClass classStruct;
-
-  private ClassWrapperNode superclass;
-
-  private final List<ClassWrapperNode> subclasses = new ArrayList<ClassWrapperNode>();
+  private final List<ClassWrapperNode> subclasses = new ArrayList<>();
 
   public ClassWrapperNode(StructClass cl) {
     this.classStruct = cl;
   }
 
   public void addSubclass(ClassWrapperNode node) {
-    node.setSuperclass(this);
     subclasses.add(node);
   }
 
@@ -44,12 +25,4 @@ public class ClassWrapperNode {
   public List<ClassWrapperNode> getSubclasses() {
     return subclasses;
   }
-
-  public ClassWrapperNode getSuperclass() {
-    return superclass;
-  }
-
-  public void setSuperclass(ClassWrapperNode superclass) {
-    this.superclass = superclass;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
index 5912e6e..4949a00 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
@@ -1,56 +1,87 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.renamer;
 
+import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer;
 
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Set;
 
 public class ConverterHelper implements IIdentifierRenamer {
-
-  private static final Set<String> KEYWORDS = new HashSet<String>(Arrays.asList(
+  private static final Set<String> KEYWORDS = new HashSet<>(Arrays.asList(
     "abstract", "do", "if", "package", "synchronized", "boolean", "double", "implements", "private", "this", "break", "else", "import",
     "protected", "throw", "byte", "extends", "instanceof", "public", "throws", "case", "false", "int", "return", "transient", "catch",
     "final", "interface", "short", "true", "char", "finally", "long", "static", "try", "class", "float", "native", "strictfp", "void",
     "const", "for", "new", "super", "volatile", "continue", "goto", "null", "switch", "while", "default", "assert", "enum"));
+  private static final Set<String> RESERVED_WINDOWS_NAMESPACE = new HashSet<>(Arrays.asList(
+    "con", "prn", "aux", "nul",
+    "com1", "com2", "com3", "com4", "com5", "com6", "com7", "com8", "com9",
+    "lpt1", "lpt2", "lpt3", "lpt4", "lpt5", "lpt6", "lpt7", "lpt8", "lpt9"));
 
   private int classCounter = 0;
   private int fieldCounter = 0;
   private int methodCounter = 0;
-  private final Set<String> setNonStandardClassNames = new HashSet<String>();
+  private final Set<String> setNonStandardClassNames = new HashSet<>();
 
   @Override
   public boolean toBeRenamed(Type elementType, String className, String element, String descriptor) {
     String value = elementType == Type.ELEMENT_CLASS ? className : element;
-    return value == null || value.length() == 0 || value.length() <= 2 || KEYWORDS.contains(value) || Character.isDigit(value.charAt(0));
+    return value == null ||
+           value.length() <= 2 ||
+           !isValidIdentifier(elementType == Type.ELEMENT_METHOD, value) ||
+           KEYWORDS.contains(value) ||
+           elementType == Type.ELEMENT_CLASS && (
+             RESERVED_WINDOWS_NAMESPACE.contains(value.toLowerCase(Locale.ENGLISH)) ||
+             value.length() > 255 - ".class".length());
+  }
+
+  /**
+   * Return {@code true} if, and only if identifier passed is compliant to JLS9 section 3.8 AND DOES NOT CONTAINS so-called "ignorable" characters.
+   * Ignorable characters are removed by javac silently during compilation and thus may appear only in specially crafted obfuscated classes.
+   * For more information about "ignorable" characters see <a href="https://bugs.openjdk.java.net/browse/JDK-7144981">JDK-7144981</a>.
+   *
+   * @param identifier Identifier to be checked
+   * @return {@code true} in case {@code identifier} passed can be used as an identifier; {@code false} otherwise.
+   */
+  private static boolean isValidIdentifier(boolean isMethod, String identifier) {
+
+    assert identifier != null : "Null identifier passed to the isValidIdentifier() method.";
+    assert !identifier.isEmpty() : "Empty identifier passed to the isValidIdentifier() method.";
+
+    if (isMethod && (identifier.equals(CodeConstants.INIT_NAME) || identifier.equals(CodeConstants.CLINIT_NAME))) {
+      return true;
+    }
+
+    if (!Character.isJavaIdentifierStart(identifier.charAt(0))) {
+      return false;
+    }
+
+    char[] chars = identifier.toCharArray();
+
+    for(int i = 1; i < chars.length; i++) {
+      char ch = chars[i];
+
+      if ((!Character.isJavaIdentifierPart(ch)) || Character.isIdentifierIgnorable(ch)) {
+        return false;
+      }
+    }
+
+    return true;
+
   }
 
   // TODO: consider possible conflicts with not renamed classes, fields and methods!
   // We should get all relevant information here.
   @Override
   public String getNextClassName(String fullName, String shortName) {
-
     if (shortName == null) {
       return "class_" + (classCounter++);
     }
 
     int index = 0;
-    while (Character.isDigit(shortName.charAt(index))) {
+    while (index < shortName.length() && Character.isDigit(shortName.charAt(index))) {
       index++;
     }
 
@@ -59,7 +90,6 @@ public class ConverterHelper implements IIdentifierRenamer {
     }
     else {
       String name = shortName.substring(index);
-
       if (setNonStandardClassNames.contains(name)) {
         return "Inner" + name + "_" + (classCounter++);
       }
@@ -91,4 +121,4 @@ public class ConverterHelper implements IIdentifierRenamer {
   public static String replaceSimpleClassName(String fullName, String newName) {
     return fullName.substring(0, fullName.lastIndexOf('/') + 1) + newName;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java b/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
index ee268e6..ba09aa1 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
@@ -1,23 +1,7 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.renamer;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
-import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer;
 import org.jetbrains.java.decompiler.struct.StructClass;
 import org.jetbrains.java.decompiler.struct.StructContext;
@@ -32,41 +16,25 @@ import java.io.IOException;
 import java.util.*;
 
 public class IdentifierConverter implements NewClassNameBuilder {
+  private final StructContext context;
+  private final IIdentifierRenamer helper;
+  private final PoolInterceptor interceptor;
+  private List<ClassWrapperNode> rootClasses = new ArrayList<>();
+  private List<ClassWrapperNode> rootInterfaces = new ArrayList<>();
+  private Map<String, Map<String, String>> interfaceNameMaps = new HashMap<>();
 
-  private StructContext context;
-  private IIdentifierRenamer helper;
-  private PoolInterceptor interceptor;
-  private List<ClassWrapperNode> rootClasses = new ArrayList<ClassWrapperNode>();
-  private List<ClassWrapperNode> rootInterfaces = new ArrayList<ClassWrapperNode>();
-  private Map<String, Map<String, String>> interfaceNameMaps = new HashMap<String, Map<String, String>>();
+  public IdentifierConverter(StructContext context, IIdentifierRenamer helper, PoolInterceptor interceptor) {
+    this.context = context;
+    this.helper = helper;
+    this.interceptor = interceptor;
+  }
 
-  public void rename(StructContext context) {
+  public void rename() {
     try {
-      this.context = context;
-
-      String user_class = (String)DecompilerContext.getProperty(IFernflowerPreferences.USER_RENAMER_CLASS);
-      if (user_class != null) {
-        try {
-          helper = (IIdentifierRenamer)IdentifierConverter.class.getClassLoader().loadClass(user_class).newInstance();
-        }
-        catch (Exception ignored) { }
-      }
-
-      if (helper == null) {
-        helper = new ConverterHelper();
-      }
-
-      interceptor = new PoolInterceptor(helper);
-
       buildInheritanceTree();
-
       renameAllClasses();
-
       renameInterfaces();
-
       renameClasses();
-
-      DecompilerContext.setPoolInterceptor(interceptor);
       context.reloadContext();
     }
     catch (IOException ex) {
@@ -76,11 +44,11 @@ public class IdentifierConverter implements NewClassNameBuilder {
 
   private void renameClasses() {
     List<ClassWrapperNode> lstClasses = getReversePostOrderListIterative(rootClasses);
-    Map<String, Map<String, String>> classNameMaps = new HashMap<String, Map<String, String>>();
+    Map<String, Map<String, String>> classNameMaps = new HashMap<>();
 
     for (ClassWrapperNode node : lstClasses) {
       StructClass cl = node.getClassStruct();
-      Map<String, String> names = new HashMap<String, String>();
+      Map<String, String> names = new HashMap<>();
 
       // merge information on super class
       if (cl.superClass != null) {
@@ -113,7 +81,7 @@ public class IdentifierConverter implements NewClassNameBuilder {
   }
 
   private Map<String, String> processExternalInterface(StructClass cl) {
-    Map<String, String> names = new HashMap<String, String>();
+    Map<String, String> names = new HashMap<>();
 
     for (String ifName : cl.getInterfaceNames()) {
       Map<String, String> mapInt = interfaceNameMaps.get(ifName);
@@ -135,13 +103,13 @@ public class IdentifierConverter implements NewClassNameBuilder {
 
   private void renameInterfaces() {
     List<ClassWrapperNode> lstInterfaces = getReversePostOrderListIterative(rootInterfaces);
-    Map<String, Map<String, String>> interfaceNameMaps = new HashMap<String, Map<String, String>>();
+    Map<String, Map<String, String>> interfaceNameMaps = new HashMap<>();
 
     // rename methods and fields
     for (ClassWrapperNode node : lstInterfaces) {
 
       StructClass cl = node.getClassStruct();
-      Map<String, String> names = new HashMap<String, String>();
+      Map<String, String> names = new HashMap<>();
 
       // merge information on super interfaces
       for (String ifName : cl.getInterfaceNames()) {
@@ -161,7 +129,7 @@ public class IdentifierConverter implements NewClassNameBuilder {
 
   private void renameAllClasses() {
     // order not important
-    List<ClassWrapperNode> lstAllClasses = new ArrayList<ClassWrapperNode>(getReversePostOrderListIterative(rootInterfaces));
+    List<ClassWrapperNode> lstAllClasses = new ArrayList<>(getReversePostOrderListIterative(rootInterfaces));
     lstAllClasses.addAll(getReversePostOrderListIterative(rootClasses));
 
     // rename all interfaces and classes
@@ -203,7 +171,7 @@ public class IdentifierConverter implements NewClassNameBuilder {
     }
 
     // methods
-    HashSet<String> setMethodNames = new HashSet<String>();
+    HashSet<String> setMethodNames = new HashSet<>();
     for (StructMethod md : cl.getMethods()) {
       setMethodNames.add(md.getName());
     }
@@ -250,7 +218,7 @@ public class IdentifierConverter implements NewClassNameBuilder {
 
     // fields
     // FIXME: should overloaded fields become the same name?
-    HashSet<String> setFieldNames = new HashSet<String>();
+    HashSet<String> setFieldNames = new HashSet<>();
     for (StructField fd : cl.getFields()) {
       setFieldNames.add(fd.getName());
     }
@@ -286,12 +254,12 @@ public class IdentifierConverter implements NewClassNameBuilder {
   }
 
   private static List<ClassWrapperNode> getReversePostOrderListIterative(List<ClassWrapperNode> roots) {
-    List<ClassWrapperNode> res = new ArrayList<ClassWrapperNode>();
+    List<ClassWrapperNode> res = new ArrayList<>();
 
-    LinkedList<ClassWrapperNode> stackNode = new LinkedList<ClassWrapperNode>();
-    LinkedList<Integer> stackIndex = new LinkedList<Integer>();
+    LinkedList<ClassWrapperNode> stackNode = new LinkedList<>();
+    LinkedList<Integer> stackIndex = new LinkedList<>();
 
-    Set<ClassWrapperNode> setVisited = new HashSet<ClassWrapperNode>();
+    Set<ClassWrapperNode> setVisited = new HashSet<>();
 
     for (ClassWrapperNode root : roots) {
       stackNode.add(root);
@@ -326,19 +294,19 @@ public class IdentifierConverter implements NewClassNameBuilder {
   }
 
   private void buildInheritanceTree() {
-    Map<String, ClassWrapperNode> nodes = new HashMap<String, ClassWrapperNode>();
+    Map<String, ClassWrapperNode> nodes = new HashMap<>();
     Map<String, StructClass> classes = context.getClasses();
 
-    List<ClassWrapperNode> rootClasses = new ArrayList<ClassWrapperNode>();
-    List<ClassWrapperNode> rootInterfaces = new ArrayList<ClassWrapperNode>();
+    List<ClassWrapperNode> rootClasses = new ArrayList<>();
+    List<ClassWrapperNode> rootInterfaces = new ArrayList<>();
 
     for (StructClass cl : classes.values()) {
       if (!cl.isOwn()) {
         continue;
       }
 
-      LinkedList<StructClass> stack = new LinkedList<StructClass>();
-      LinkedList<ClassWrapperNode> stackSubNodes = new LinkedList<ClassWrapperNode>();
+      LinkedList<StructClass> stack = new LinkedList<>();
+      LinkedList<ClassWrapperNode> stackSubNodes = new LinkedList<>();
 
       stack.add(cl);
       stackSubNodes.add(null);
@@ -354,7 +322,6 @@ public class IdentifierConverter implements NewClassNameBuilder {
           nodes.put(clStr.qualifiedName, node = new ClassWrapperNode(clStr));
         }
 
-        //noinspection ConstantConditions
         if (child != null) {
           node.addSubclass(child);
         }
@@ -395,4 +362,4 @@ public class IdentifierConverter implements NewClassNameBuilder {
     this.rootClasses = rootClasses;
     this.rootInterfaces = rootInterfaces;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java b/src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java
index 7d589cc..63cb222 100644
--- a/src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java
+++ b/src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java
@@ -1,35 +1,12 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.modules.renamer;
 
-import org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer;
-
 import java.util.HashMap;
+import java.util.Map;
 
 public class PoolInterceptor {
-
-  private final IIdentifierRenamer helper;
-
-  private final HashMap<String, String> mapOldToNewNames = new HashMap<String, String>();
-
-  private final HashMap<String, String> mapNewToOldNames = new HashMap<String, String>();
-
-  public PoolInterceptor(IIdentifierRenamer helper) {
-    this.helper = helper;
-  }
+  private final Map<String, String> mapOldToNewNames = new HashMap<>();
+  private final Map<String, String> mapNewToOldNames = new HashMap<>();
 
   public void addName(String oldName, String newName) {
     mapOldToNewNames.put(oldName, newName);
@@ -43,8 +20,4 @@ public class PoolInterceptor {
   public String getOldName(String newName) {
     return mapNewToOldNames.get(newName);
   }
-
-  public IIdentifierRenamer getHelper() {
-    return helper;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
index 850c3d8..f9cd2af 100644
--- a/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
+++ b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
@@ -42,11 +28,11 @@ public class ContextUnit {
   private final IResultSaver resultSaver;
   private final IDecompiledData decompiledData;
 
-  private final List<String> classEntries = new ArrayList<String>();  // class file or jar/zip entry
-  private final List<String> dirEntries = new ArrayList<String>();
-  private final List<String[]> otherEntries = new ArrayList<String[]>();
+  private final List<String> classEntries = new ArrayList<>();  // class file or jar/zip entry
+  private final List<String> dirEntries = new ArrayList<>();
+  private final List<String[]> otherEntries = new ArrayList<>();
 
-  private List<StructClass> classes = new ArrayList<StructClass>();
+  private List<StructClass> classes = new ArrayList<>();
   private Manifest manifest;
 
   public ContextUnit(int type, String archivePath, String filename, boolean own, IResultSaver resultSaver, IDecompiledData decompiledData) {
@@ -72,19 +58,15 @@ public class ContextUnit {
   }
 
   public void reload(LazyLoader loader) throws IOException {
-    List<StructClass> lstClasses = new ArrayList<StructClass>();
+    List<StructClass> lstClasses = new ArrayList<>();
 
     for (StructClass cl : classes) {
       String oldName = cl.qualifiedName;
 
       StructClass newCl;
-      DataInputFullStream in = loader.getClassStream(oldName);
-      try {
+      try (DataInputFullStream in = loader.getClassStream(oldName)) {
         newCl = new StructClass(in, cl.isOwn(), loader);
       }
-      finally {
-        in.close();
-      }
 
       lstClasses.add(newCl);
 
@@ -168,4 +150,4 @@ public class ContextUnit {
   public List<StructClass> getClasses() {
     return classes;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/IDecompiledData.java b/src/org/jetbrains/java/decompiler/struct/IDecompiledData.java
index f309b0e..b3b38dd 100644
--- a/src/org/jetbrains/java/decompiler/struct/IDecompiledData.java
+++ b/src/org/jetbrains/java/decompiler/struct/IDecompiledData.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct;
 
 public interface IDecompiledData {
diff --git a/src/org/jetbrains/java/decompiler/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
index cb24ff6..02bb74a 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructClass.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructClass.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -93,7 +79,7 @@ public class StructClass extends StructMember {
 
     // fields
     length = in.readUnsignedShort();
-    fields = new VBStyleCollection<StructField, String>();
+    fields = new VBStyleCollection<>(length);
     for (int i = 0; i < length; i++) {
       StructField field = new StructField(in, this);
       fields.addWithKey(field, InterpreterUtil.makeUniqueKey(field.getName(), field.getDescriptor()));
@@ -101,7 +87,7 @@ public class StructClass extends StructMember {
 
     // methods
     length = in.readUnsignedShort();
-    methods = new VBStyleCollection<StructMethod, String>();
+    methods = new VBStyleCollection<>(length);
     for (int i = 0; i < length; i++) {
       StructMethod method = new StructMethod(in, this);
       methods.addWithKey(method, InterpreterUtil.makeUniqueKey(method.getName(), method.getDescriptor()));
@@ -171,25 +157,20 @@ public class StructClass extends StructMember {
   }
 
   public boolean isVersionGE_1_5() {
-    return (majorVersion > 48 || (majorVersion == 48 && minorVersion > 0)); // FIXME: check second condition
+    return (majorVersion > CodeConstants.BYTECODE_JAVA_LE_4 ||
+            (majorVersion == CodeConstants.BYTECODE_JAVA_LE_4 && minorVersion > 0)); // FIXME: check second condition
   }
 
   public boolean isVersionGE_1_7() {
-    return (majorVersion >= 51);
+    return (majorVersion >= CodeConstants.BYTECODE_JAVA_7);
   }
 
   public int getBytecodeVersion() {
-    switch (majorVersion) {
-      case 52:
-        return CodeConstants.BYTECODE_JAVA_8;
-      case 51:
-        return CodeConstants.BYTECODE_JAVA_7;
-      case 50:
-        return CodeConstants.BYTECODE_JAVA_6;
-      case 49:
-        return CodeConstants.BYTECODE_JAVA_5;
-    }
+    return majorVersion < CodeConstants.BYTECODE_JAVA_LE_4 ? CodeConstants.BYTECODE_JAVA_LE_4 : majorVersion;
+  }
 
-    return CodeConstants.BYTECODE_JAVA_LE_4;
+  @Override
+  public String toString() {
+    return qualifiedName;
   }
 }
diff --git a/src/org/jetbrains/java/decompiler/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
index 7bfb139..6d07096 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructContext.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructContext.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
@@ -35,8 +21,8 @@ public class StructContext {
   private final IResultSaver saver;
   private final IDecompiledData decompiledData;
   private final LazyLoader loader;
-  private final Map<String, ContextUnit> units = new HashMap<String, ContextUnit>();
-  private final Map<String, StructClass> classes = new HashMap<String, StructClass>();
+  private final Map<String, ContextUnit> units = new HashMap<>();
+  private final Map<String, StructClass> classes = new HashMap<>();
 
   public StructContext(IResultSaver saver, IDecompiledData decompiledData, LazyLoader loader) {
     this.saver = saver;
@@ -119,17 +105,11 @@ public class StructContext {
       }
 
       if (filename.endsWith(".class")) {
-        try {
-          DataInputFullStream in = loader.getClassStream(file.getAbsolutePath(), null);
-          try {
-            StructClass cl = new StructClass(in, isOwn, loader);
-            classes.put(cl.qualifiedName, cl);
-            unit.addClass(cl, filename);
-            loader.addClassLink(cl.qualifiedName, new LazyLoader.Link(LazyLoader.Link.CLASS, file.getAbsolutePath(), null));
-          }
-          finally {
-            in.close();
-          }
+        try (DataInputFullStream in = loader.getClassStream(file.getAbsolutePath(), null)) {
+          StructClass cl = new StructClass(in, isOwn, loader);
+          classes.put(cl.qualifiedName, cl);
+          unit.addClass(cl, filename);
+          loader.addClassLink(cl.qualifiedName, new LazyLoader.Link(file.getAbsolutePath(), null));
         }
         catch (IOException ex) {
           String message = "Corrupted class file: " + file;
@@ -143,10 +123,7 @@ public class StructContext {
   }
 
   private void addArchive(String path, File file, int type, boolean isOwn) throws IOException {
-    @SuppressWarnings("IOResourceOpenedButNotSafelyClosed")
-    ZipFile archive = type == ContextUnit.TYPE_JAR ? new JarFile(file) : new ZipFile(file);
-
-    try {
+    try (ZipFile archive = type == ContextUnit.TYPE_JAR ? new JarFile(file) : new ZipFile(file)) {
       Enumeration<? extends ZipEntry> entries = archive.entries();
       while (entries.hasMoreElements()) {
         ZipEntry entry = entries.nextElement();
@@ -167,7 +144,7 @@ public class StructContext {
             StructClass cl = new StructClass(bytes, isOwn, loader);
             classes.put(cl.qualifiedName, cl);
             unit.addClass(cl, name);
-            loader.addClassLink(cl.qualifiedName, new LazyLoader.Link(LazyLoader.Link.ENTRY, file.getAbsolutePath(), name));
+            loader.addClassLink(cl.qualifiedName, new LazyLoader.Link(file.getAbsolutePath(), name));
           }
           else {
             unit.addOtherEntry(file.getAbsolutePath(), name);
@@ -178,12 +155,9 @@ public class StructContext {
         }
       }
     }
-    finally {
-      archive.close();
-    }
   }
 
   public Map<String, StructClass> getClasses() {
     return classes;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/StructField.java b/src/org/jetbrains/java/decompiler/struct/StructField.java
index 796d77f..6c85ca4 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructField.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructField.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
@@ -55,4 +41,9 @@ public class StructField extends StructMember {
   public String getDescriptor() {
     return descriptor;
   }
+
+  @Override
+  public String toString() {
+    return name;
+  }
 }
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMember.java b/src/org/jetbrains/java/decompiler/struct/StructMember.java
index f681e19..a5b87f1 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMember.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMember.java
@@ -1,41 +1,34 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
 import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
+import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTypeTableAttribute;
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.util.DataInputFullStream;
-import org.jetbrains.java.decompiler.util.VBStyleCollection;
 
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 public class StructMember {
 
   protected int accessFlags;
-  protected VBStyleCollection<StructGeneralAttribute, String> attributes;
+  protected Map<String, StructGeneralAttribute> attributes;
 
 
   public int getAccessFlags() {
     return accessFlags;
   }
 
-  public VBStyleCollection<StructGeneralAttribute, String> getAttributes() {
-    return attributes;
+  public <T extends StructGeneralAttribute> T getAttribute(StructGeneralAttribute.Key<T> attribute) {
+    //noinspection unchecked
+    return (T)attributes.get(attribute.getName());
+  }
+
+  public boolean hasAttribute(StructGeneralAttribute.Key<?> attribute) {
+    return attributes.containsKey(attribute.getName());
   }
 
   public boolean hasModifier(int modifier) {
@@ -43,13 +36,13 @@ public class StructMember {
   }
 
   public boolean isSynthetic() {
-    return hasModifier(CodeConstants.ACC_SYNTHETIC) || attributes.containsKey(StructGeneralAttribute.ATTRIBUTE_SYNTHETIC);
+    return hasModifier(CodeConstants.ACC_SYNTHETIC) || hasAttribute(StructGeneralAttribute.ATTRIBUTE_SYNTHETIC);
   }
 
-  protected VBStyleCollection<StructGeneralAttribute, String> readAttributes(DataInputFullStream in, ConstantPool pool) throws IOException {
-    VBStyleCollection<StructGeneralAttribute, String> attributes = new VBStyleCollection<StructGeneralAttribute, String>();
-
+  protected Map<String, StructGeneralAttribute> readAttributes(DataInputFullStream in, ConstantPool pool) throws IOException {
     int length = in.readUnsignedShort();
+
+    Map<String, StructGeneralAttribute> attributes = new HashMap<>(length);
     for (int i = 0; i < length; i++) {
       int nameIndex = in.readUnsignedShort();
       String name = pool.getPrimitiveConstant(nameIndex).getString();
@@ -57,13 +50,18 @@ public class StructMember {
       StructGeneralAttribute attribute = readAttribute(in, pool, name);
 
       if (attribute != null) {
-        if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name) && attributes.containsKey(name)) {
+        if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE.getName().equals(name) && attributes.containsKey(name)) {
           // merge all variable tables
-          StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.getWithKey(name);
-          table.addLocalVariableTable((StructLocalVariableTableAttribute)attribute);
+          StructLocalVariableTableAttribute table = (StructLocalVariableTableAttribute)attributes.get(name);
+          table.add((StructLocalVariableTableAttribute)attribute);
+        }
+        else if (StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.getName().equals(name) && attributes.containsKey(name)) {
+          // merge all variable tables
+          StructLocalVariableTypeTableAttribute table = (StructLocalVariableTypeTableAttribute)attributes.get(name);
+          table.add((StructLocalVariableTypeTableAttribute)attribute);
         }
         else {
-          attributes.addWithKey(attribute, attribute.getName());
+          attributes.put(attribute.getName(), attribute);
         }
       }
     }
@@ -73,15 +71,13 @@ public class StructMember {
 
   protected StructGeneralAttribute readAttribute(DataInputFullStream in, ConstantPool pool, String name) throws IOException {
     StructGeneralAttribute attribute = StructGeneralAttribute.createAttribute(name);
+    int length = in.readInt();
     if (attribute == null) {
-      in.discard(in.readInt());
+      in.discard(length);
     }
     else {
-      byte[] data = new byte[in.readInt()];
-      in.readFull(data);
-      attribute.setInfo(data);
-      attribute.initContent(pool);
+      attribute.initContent(in, pool);
     }
     return attribute;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
index 2b5249f..859805c 100644
--- a/src/org/jetbrains/java/decompiler/struct/StructMethod.java
+++ b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct;
 
 import org.jetbrains.java.decompiler.code.*;
 import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
+import org.jetbrains.java.decompiler.struct.attr.StructLocalVariableTableAttribute;
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.util.DataInputFullStream;
 import org.jetbrains.java.decompiler.util.VBStyleCollection;
@@ -24,6 +11,7 @@ import org.jetbrains.java.decompiler.util.VBStyleCollection;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import static org.jetbrains.java.decompiler.code.CodeConstants.*;
 
@@ -37,7 +25,6 @@ import static org.jetbrains.java.decompiler.code.CodeConstants.*;
   }
 */
 public class StructMethod extends StructMember {
-
   private static final int[] opr_iconst = {-1, 0, 1, 2, 3, 4, 5};
   private static final int[] opr_loadstore = {0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3};
   private static final int[] opcs_load = {opc_iload, opc_lload, opc_fload, opc_dload, opc_aload};
@@ -53,7 +40,7 @@ public class StructMethod extends StructMember {
   private int codeFullLength = 0;
   private InstructionSequence seq;
   private boolean expanded = false;
-  private VBStyleCollection<StructGeneralAttribute, String> codeAttributes;
+  private Map<String, StructGeneralAttribute> codeAttributes;
 
   public StructMethod(DataInputFullStream in, StructClass clStruct) throws IOException {
     classStruct = clStruct;
@@ -69,14 +56,14 @@ public class StructMethod extends StructMember {
 
     attributes = readAttributes(in, pool);
     if (codeAttributes != null) {
-      attributes.addAllWithKey(codeAttributes);
+      attributes.putAll(codeAttributes);
       codeAttributes = null;
     }
   }
 
   @Override
   protected StructGeneralAttribute readAttribute(DataInputFullStream in, ConstantPool pool, String name) throws IOException {
-    if (StructGeneralAttribute.ATTRIBUTE_CODE.equals(name)) {
+    if (StructGeneralAttribute.ATTRIBUTE_CODE.getName().equals(name)) {
       if (!classStruct.isOwn()) {
         // skip code in foreign classes
         in.discard(8);
@@ -110,7 +97,7 @@ public class StructMethod extends StructMember {
     }
   }
 
-  public void releaseResources() throws IOException {
+  public void releaseResources() {
     if (containsCode && expanded) {
       seq = null;
       expanded = false;
@@ -119,7 +106,7 @@ public class StructMethod extends StructMember {
 
   @SuppressWarnings("AssignmentToForLoopParameter")
   private InstructionSequence parseBytecode(DataInputFullStream in, int length, ConstantPool pool) throws IOException {
-    VBStyleCollection<Instruction, Integer> instructions = new VBStyleCollection<Instruction, Integer>();
+    VBStyleCollection<Instruction, Integer> instructions = new VBStyleCollection<>();
 
     int bytecode_version = classStruct.getBytecodeVersion();
 
@@ -137,29 +124,29 @@ public class StructMethod extends StructMember {
         opcode = in.readUnsignedByte();
       }
 
-      List<Integer> operands = new ArrayList<Integer>();
+      List<Integer> operands = new ArrayList<>();
 
       if (opcode >= opc_iconst_m1 && opcode <= opc_iconst_5) {
-        operands.add(new Integer(opr_iconst[opcode - opc_iconst_m1]));
+        operands.add(opr_iconst[opcode - opc_iconst_m1]);
         opcode = opc_bipush;
       }
       else if (opcode >= opc_iload_0 && opcode <= opc_aload_3) {
-        operands.add(new Integer(opr_loadstore[opcode - opc_iload_0]));
+        operands.add(opr_loadstore[opcode - opc_iload_0]);
         opcode = opcs_load[(opcode - opc_iload_0) / 4];
       }
       else if (opcode >= opc_istore_0 && opcode <= opc_astore_3) {
-        operands.add(new Integer(opr_loadstore[opcode - opc_istore_0]));
+        operands.add(opr_loadstore[opcode - opc_istore_0]);
         opcode = opcs_store[(opcode - opc_istore_0) / 4];
       }
       else {
         switch (opcode) {
           case opc_bipush:
-            operands.add(new Integer(in.readByte()));
+            operands.add((int)in.readByte());
             i++;
             break;
           case opc_ldc:
           case opc_newarray:
-            operands.add(new Integer(in.readUnsignedByte()));
+            operands.add(in.readUnsignedByte());
             i++;
             break;
           case opc_sipush:
@@ -184,7 +171,7 @@ public class StructMethod extends StructMember {
             if (opcode != opc_sipush) {
               group = GROUP_JUMP;
             }
-            operands.add(new Integer(in.readShort()));
+            operands.add((int)in.readShort());
             i += 2;
             break;
           case opc_ldc_w:
@@ -200,7 +187,7 @@ public class StructMethod extends StructMember {
           case opc_anewarray:
           case opc_checkcast:
           case opc_instanceof:
-            operands.add(new Integer(in.readUnsignedShort()));
+            operands.add(in.readUnsignedShort());
             i += 2;
             if (opcode >= opc_getstatic && opcode <= opc_putfield) {
               group = GROUP_FIELDACCESS;
@@ -211,7 +198,7 @@ public class StructMethod extends StructMember {
             break;
           case opc_invokedynamic:
             if (classStruct.isVersionGE_1_7()) { // instruction unused in Java 6 and before
-              operands.add(new Integer(in.readUnsignedShort()));
+              operands.add(in.readUnsignedShort());
               in.discard(2);
               group = GROUP_INVOCATION;
               i += 4;
@@ -229,11 +216,11 @@ public class StructMethod extends StructMember {
           case opc_astore:
           case opc_ret:
             if (wide) {
-              operands.add(new Integer(in.readUnsignedShort()));
+              operands.add(in.readUnsignedShort());
               i += 2;
             }
             else {
-              operands.add(new Integer(in.readUnsignedByte()));
+              operands.add(in.readUnsignedByte());
               i++;
             }
             if (opcode == opc_ret) {
@@ -242,49 +229,49 @@ public class StructMethod extends StructMember {
             break;
           case opc_iinc:
             if (wide) {
-              operands.add(new Integer(in.readUnsignedShort()));
-              operands.add(new Integer(in.readShort()));
+              operands.add(in.readUnsignedShort());
+              operands.add((int)in.readShort());
               i += 4;
             }
             else {
-              operands.add(new Integer(in.readUnsignedByte()));
-              operands.add(new Integer(in.readByte()));
+              operands.add(in.readUnsignedByte());
+              operands.add((int)in.readByte());
               i += 2;
             }
             break;
           case opc_goto_w:
           case opc_jsr_w:
             opcode = opcode == opc_jsr_w ? opc_jsr : opc_goto;
-            operands.add(new Integer(in.readInt()));
+            operands.add(in.readInt());
             group = GROUP_JUMP;
             i += 4;
             break;
           case opc_invokeinterface:
-            operands.add(new Integer(in.readUnsignedShort()));
-            operands.add(new Integer(in.readUnsignedByte()));
+            operands.add(in.readUnsignedShort());
+            operands.add(in.readUnsignedByte());
             in.discard(1);
             group = GROUP_INVOCATION;
             i += 4;
             break;
           case opc_multianewarray:
-            operands.add(new Integer(in.readUnsignedShort()));
-            operands.add(new Integer(in.readUnsignedByte()));
+            operands.add(in.readUnsignedShort());
+            operands.add(in.readUnsignedByte());
             i += 3;
             break;
           case opc_tableswitch:
             in.discard((4 - (i + 1) % 4) % 4);
             i += ((4 - (i + 1) % 4) % 4); // padding
-            operands.add(new Integer(in.readInt()));
+            operands.add(in.readInt());
             i += 4;
             int low = in.readInt();
-            operands.add(new Integer(low));
+            operands.add(low);
             i += 4;
             int high = in.readInt();
-            operands.add(new Integer(high));
+            operands.add(high);
             i += 4;
 
             for (int j = 0; j < high - low + 1; j++) {
-              operands.add(new Integer(in.readInt()));
+              operands.add(in.readInt());
               i += 4;
             }
             group = GROUP_SWITCH;
@@ -293,16 +280,16 @@ public class StructMethod extends StructMember {
           case opc_lookupswitch:
             in.discard((4 - (i + 1) % 4) % 4);
             i += ((4 - (i + 1) % 4) % 4); // padding
-            operands.add(new Integer(in.readInt()));
+            operands.add(in.readInt());
             i += 4;
             int npairs = in.readInt();
-            operands.add(new Integer(npairs));
+            operands.add(npairs);
             i += 4;
 
             for (int j = 0; j < npairs; j++) {
-              operands.add(new Integer(in.readInt()));
+              operands.add(in.readInt());
               i += 4;
-              operands.add(new Integer(in.readInt()));
+              operands.add(in.readInt());
               i += 4;
             }
             group = GROUP_SWITCH;
@@ -318,20 +305,23 @@ public class StructMethod extends StructMember {
         }
       }
 
-      int[] ops = new int[operands.size()];
-      for (int j = 0; j < operands.size(); j++) {
-        ops[j] = operands.get(j).intValue();
+      int[] ops = null;
+      if (!operands.isEmpty()) {
+        ops = new int[operands.size()];
+        for (int j = 0; j < operands.size(); j++) {
+          ops[j] = operands.get(j);
+        }
       }
 
-      Instruction instr = ConstantsUtil.getInstructionInstance(opcode, wide, group, bytecode_version, ops);
+      Instruction instr = Instruction.create(opcode, wide, group, bytecode_version, ops);
 
-      instructions.addWithKey(instr, new Integer(offset));
+      instructions.addWithKey(instr, offset);
 
       i++;
     }
 
     // initialize exception table
-    List<ExceptionHandler> lstHandlers = new ArrayList<ExceptionHandler>();
+    List<ExceptionHandler> lstHandlers = new ArrayList<>();
 
     int exception_count = in.readUnsignedShort();
     for (int i = 0; i < exception_count; i++) {
@@ -341,7 +331,6 @@ public class StructMethod extends StructMember {
       handler.handler = in.readUnsignedShort();
 
       int excclass = in.readUnsignedShort();
-      handler.class_index = excclass;
       if (excclass != 0) {
         handler.exceptionClass = pool.getPrimitiveConstant(excclass).getString();
       }
@@ -389,4 +378,13 @@ public class StructMethod extends StructMember {
   public InstructionSequence getInstructionSequence() {
     return seq;
   }
-}
+
+  public StructLocalVariableTableAttribute getLocalVariableAttr() {
+    return getAttribute(StructGeneralAttribute.ATTRIBUTE_LOCAL_VARIABLE_TABLE);
+  }
+
+  @Override
+  public String toString() {
+    return name;
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnDefaultAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnDefaultAttribute.java
index fbad47e..891ffba 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnDefaultAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnDefaultAttribute.java
@@ -1,22 +1,9 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
 import java.io.IOException;
 
@@ -25,8 +12,8 @@ public class StructAnnDefaultAttribute extends StructGeneralAttribute {
   private Exprent defaultValue;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    defaultValue = StructAnnotationAttribute.parseAnnotationElement(stream(), pool);
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
+    defaultValue = StructAnnotationAttribute.parseAnnotationElement(data, pool);
   }
 
   public Exprent getDefaultValue() {
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
index 73af88d..dec6b28 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -21,6 +7,7 @@ import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.struct.consts.PrimitiveConstant;
 import org.jetbrains.java.decompiler.struct.gen.FieldDescriptor;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -29,18 +16,17 @@ import java.util.Collections;
 import java.util.List;
 
 public class StructAnnotationAttribute extends StructGeneralAttribute {
-
   private List<AnnotationExprent> annotations;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    annotations = parseAnnotations(pool, stream());
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
+    annotations = parseAnnotations(pool, data);
   }
 
   public static List<AnnotationExprent> parseAnnotations(ConstantPool pool, DataInputStream data) throws IOException {
     int len = data.readUnsignedShort();
     if (len > 0) {
-      List<AnnotationExprent> annotations = new ArrayList<AnnotationExprent>(len);
+      List<AnnotationExprent> annotations = new ArrayList<>(len);
       for (int i = 0; i < len; i++) {
         annotations.add(parseAnnotation(data, pool));
       }
@@ -58,8 +44,8 @@ public class StructAnnotationAttribute extends StructGeneralAttribute {
     List<Exprent> values;
     int len = data.readUnsignedShort();
     if (len > 0) {
-      names = new ArrayList<String>(len);
-      values = new ArrayList<Exprent>(len);
+      names = new ArrayList<>(len);
+      values = new ArrayList<>(len);
       for (int i = 0; i < len; i++) {
         names.add(pool.getPrimitiveConstant(data.readUnsignedShort()).getString());
         values.add(parseAnnotationElement(data, pool));
@@ -128,7 +114,7 @@ public class StructAnnotationAttribute extends StructGeneralAttribute {
         List<Exprent> elements = Collections.emptyList();
         int len = data.readUnsignedShort();
         if (len > 0) {
-          elements = new ArrayList<Exprent>(len);
+          elements = new ArrayList<>(len);
           for (int i = 0; i < len; i++) {
             elements.add(parseAnnotationElement(data, pool));
           }
@@ -143,7 +129,7 @@ public class StructAnnotationAttribute extends StructGeneralAttribute {
           newType = new VarType(elementType.type, 1, elementType.value);
         }
 
-        NewExprent newExpr = new NewExprent(newType, Collections.<Exprent>emptyList(), null);
+        NewExprent newExpr = new NewExprent(newType, Collections.emptyList(), null);
         newExpr.setDirectArrayInit(true);
         newExpr.setLstArrayElements(elements);
         return newExpr;
@@ -181,4 +167,4 @@ public class StructAnnotationAttribute extends StructGeneralAttribute {
   public List<AnnotationExprent> getAnnotations() {
     return annotations;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java
index a33c7bb..d3f0de5 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java
@@ -1,24 +1,10 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent;
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
-import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -29,12 +15,10 @@ public class StructAnnotationParameterAttribute extends StructGeneralAttribute {
   private List<List<AnnotationExprent>> paramAnnotations;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputStream data = stream();
-
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
     int len = data.readUnsignedByte();
     if (len > 0) {
-      paramAnnotations = new ArrayList<List<AnnotationExprent>>(len);
+      paramAnnotations = new ArrayList<>(len);
       for (int i = 0; i < len; i++) {
         List<AnnotationExprent> annotations = StructAnnotationAttribute.parseAnnotations(pool, data);
         paramAnnotations.add(annotations);
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationTypeAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationTypeAttribute.java
deleted file mode 100644
index 59324e3..0000000
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationTypeAttribute.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.struct.attr;
-
-import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent;
-import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class StructAnnotationTypeAttribute extends StructGeneralAttribute {
-
-  private static final int ANNOTATION_TARGET_TYPE_GENERIC_CLASS = 0x00;
-  private static final int ANNOTATION_TARGET_TYPE_GENERIC_METHOD = 0x01;
-  private static final int ANNOTATION_TARGET_TYPE_EXTENDS_IMPLEMENTS = 0x10;
-  private static final int ANNOTATION_TARGET_TYPE_GENERIC_CLASS_BOUND = 0x11;
-  private static final int ANNOTATION_TARGET_TYPE_GENERIC_METHOD_BOUND = 0x12;
-  private static final int ANNOTATION_TARGET_TYPE_FIELD = 0x13;
-  private static final int ANNOTATION_TARGET_TYPE_RETURN = 0x14;
-  private static final int ANNOTATION_TARGET_TYPE_RECEIVER = 0x15;
-  private static final int ANNOTATION_TARGET_TYPE_FORMAL = 0x16;
-  private static final int ANNOTATION_TARGET_TYPE_THROWS = 0x17;
-  private static final int ANNOTATION_TARGET_TYPE_LOCAL_VARIABLE = 0x40;
-  private static final int ANNOTATION_TARGET_TYPE_RESOURCE_VARIABLE = 0x41;
-  private static final int ANNOTATION_TARGET_TYPE_EXCEPTION = 0x42;
-  private static final int ANNOTATION_TARGET_TYPE_INSTANCEOF = 0x43;
-  private static final int ANNOTATION_TARGET_TYPE_NEW = 0x44;
-  private static final int ANNOTATION_TARGET_TYPE_DOUBLE_COLON_NEW = 0x45;
-  private static final int ANNOTATION_TARGET_TYPE_DOUBLE_COLON_ID = 0x46;
-  private static final int ANNOTATION_TARGET_TYPE_CAST = 0x47;
-  private static final int ANNOTATION_TARGET_TYPE_INVOCATION_CONSTRUCTOR = 0x48;
-  private static final int ANNOTATION_TARGET_TYPE_INVOCATION_METHOD = 0x49;
-  private static final int ANNOTATION_TARGET_TYPE_GENERIC_DOUBLE_COLON_NEW = 0x4A;
-  private static final int ANNOTATION_TARGET_TYPE_GENERIC_DOUBLE_COLON_ID = 0x4B;
-
-  private static final int ANNOTATION_TARGET_UNION_TYPE_PARAMETER = 1;
-  private static final int ANNOTATION_TARGET_UNION_SUPERTYPE = 2;
-  private static final int ANNOTATION_TARGET_UNION_TYPE_PARAMETER_BOUND = 3;
-  private static final int ANNOTATION_TARGET_UNION_EMPTY = 4;
-  private static final int ANNOTATION_TARGET_UNION_FORMAL_PARAMETER = 5;
-  private static final int ANNOTATION_TARGET_UNION_THROWS = 6;
-  private static final int ANNOTATION_TARGET_UNION_LOCAL_VAR = 7;
-  private static final int ANNOTATION_TARGET_UNION_CATCH = 8;
-  private static final int ANNOTATION_TARGET_UNION_OFFSET = 9;
-  private static final int ANNOTATION_TARGET_UNION_TYPE_ARGUMENT = 10;
-
-  @SuppressWarnings("FieldCanBeLocal") private List<AnnotationLocation> locations;
-  @SuppressWarnings("FieldCanBeLocal") private List<AnnotationExprent> annotations;
-
-  @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputStream data = stream();
-
-    int len = data.readUnsignedByte();
-    if (len > 0) {
-      locations = new ArrayList<AnnotationLocation>(len);
-      annotations = new ArrayList<AnnotationExprent>(len);
-      for (int i = 0; i < len; i++) {
-        locations.add(parseAnnotationLocation(data));
-        annotations.add(StructAnnotationAttribute.parseAnnotation(data, pool));
-      }
-    }
-    else {
-      locations = Collections.emptyList();
-      annotations = Collections.emptyList();
-    }
-  }
-
-  private static AnnotationLocation parseAnnotationLocation(DataInputStream data) throws IOException {
-    AnnotationLocation ann_location = new AnnotationLocation();
-
-    // target type
-    ann_location.target_type = data.readUnsignedByte();
-
-    // target union
-    switch (ann_location.target_type) {
-      case ANNOTATION_TARGET_TYPE_GENERIC_CLASS:
-      case ANNOTATION_TARGET_TYPE_GENERIC_METHOD:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_TYPE_PARAMETER;
-        break;
-      case ANNOTATION_TARGET_TYPE_EXTENDS_IMPLEMENTS:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_SUPERTYPE;
-        break;
-      case ANNOTATION_TARGET_TYPE_GENERIC_CLASS_BOUND:
-      case ANNOTATION_TARGET_TYPE_GENERIC_METHOD_BOUND:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_TYPE_PARAMETER_BOUND;
-        break;
-      case ANNOTATION_TARGET_TYPE_FIELD:
-      case ANNOTATION_TARGET_TYPE_RETURN:
-      case ANNOTATION_TARGET_TYPE_RECEIVER:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_EMPTY;
-        break;
-      case ANNOTATION_TARGET_TYPE_FORMAL:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_FORMAL_PARAMETER;
-        break;
-      case ANNOTATION_TARGET_TYPE_THROWS:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_THROWS;
-        break;
-      case ANNOTATION_TARGET_TYPE_LOCAL_VARIABLE:
-      case ANNOTATION_TARGET_TYPE_RESOURCE_VARIABLE:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_LOCAL_VAR;
-        break;
-      case ANNOTATION_TARGET_TYPE_EXCEPTION:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_CATCH;
-        break;
-      case ANNOTATION_TARGET_TYPE_INSTANCEOF:
-      case ANNOTATION_TARGET_TYPE_NEW:
-      case ANNOTATION_TARGET_TYPE_DOUBLE_COLON_NEW:
-      case ANNOTATION_TARGET_TYPE_DOUBLE_COLON_ID:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_OFFSET;
-        break;
-      case ANNOTATION_TARGET_TYPE_CAST:
-      case ANNOTATION_TARGET_TYPE_INVOCATION_CONSTRUCTOR:
-      case ANNOTATION_TARGET_TYPE_INVOCATION_METHOD:
-      case ANNOTATION_TARGET_TYPE_GENERIC_DOUBLE_COLON_NEW:
-      case ANNOTATION_TARGET_TYPE_GENERIC_DOUBLE_COLON_ID:
-        ann_location.target_union = ANNOTATION_TARGET_UNION_TYPE_ARGUMENT;
-        break;
-      default:
-        throw new RuntimeException("Unknown target type in a type annotation!");
-    }
-
-    // target union data
-
-    switch (ann_location.target_union) {
-      case ANNOTATION_TARGET_UNION_TYPE_PARAMETER:
-      case ANNOTATION_TARGET_UNION_FORMAL_PARAMETER:
-        ann_location.data = new int[]{data.readUnsignedByte()};
-        break;
-      case ANNOTATION_TARGET_UNION_SUPERTYPE:
-      case ANNOTATION_TARGET_UNION_THROWS:
-      case ANNOTATION_TARGET_UNION_CATCH:
-      case ANNOTATION_TARGET_UNION_OFFSET:
-        ann_location.data = new int[]{data.readUnsignedShort()};
-        break;
-      case ANNOTATION_TARGET_UNION_TYPE_PARAMETER_BOUND:
-        ann_location.data = new int[]{data.readUnsignedByte(), data.readUnsignedByte()};
-        break;
-      case ANNOTATION_TARGET_UNION_EMPTY:
-        break;
-      case ANNOTATION_TARGET_UNION_LOCAL_VAR:
-        int table_length = data.readUnsignedShort();
-
-        ann_location.data = new int[table_length * 3 + 1];
-        ann_location.data[0] = table_length;
-
-        for (int i = 0; i < table_length; ++i) {
-          ann_location.data[3 * i + 1] = data.readUnsignedShort();
-          ann_location.data[3 * i + 2] = data.readUnsignedShort();
-          ann_location.data[3 * i + 3] = data.readUnsignedShort();
-        }
-        break;
-      case ANNOTATION_TARGET_UNION_TYPE_ARGUMENT:
-        ann_location.data = new int[]{data.readUnsignedShort(), data.readUnsignedByte()};
-    }
-
-    // target path
-    int path_length = data.readUnsignedByte();
-
-    ann_location.target_path_kind = new int[path_length];
-    ann_location.target_argument_index = new int[path_length];
-
-    for (int i = 0; i < path_length; ++i) {
-      ann_location.target_path_kind[i] = data.readUnsignedByte();
-      ann_location.target_argument_index[i] = data.readUnsignedByte();
-    }
-
-    return ann_location;
-  }
-
-  private static class AnnotationLocation {
-    public int target_type;
-    public int target_union;
-    public int[] data;
-    public int[] target_path_kind;
-    public int[] target_argument_index;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
index 597bc7a..f97417e 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
@@ -1,45 +1,29 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
 import org.jetbrains.java.decompiler.struct.consts.PooledConstant;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
-import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 public class StructBootstrapMethodsAttribute extends StructGeneralAttribute {
 
-  private final List<LinkConstant> methodRefs = new ArrayList<LinkConstant>();
-  private final List<List<PooledConstant>> methodArguments = new ArrayList<List<PooledConstant>>();
+  private final List<LinkConstant> methodRefs = new ArrayList<>();
+  private final List<List<PooledConstant>> methodArguments = new ArrayList<>();
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputStream data = stream();
-
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
     int method_number = data.readUnsignedShort();
 
     for (int i = 0; i < method_number; ++i) {
       int bootstrap_method_ref = data.readUnsignedShort();
       int num_bootstrap_arguments = data.readUnsignedShort();
 
-      List<PooledConstant> list_arguments = new ArrayList<PooledConstant>();
+      List<PooledConstant> list_arguments = new ArrayList<>();
 
       for (int j = 0; j < num_bootstrap_arguments; ++j) {
         int bootstrap_argument_ref = data.readUnsignedShort();
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructConstantValueAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructConstantValueAttribute.java
index 07a5073..a7e5cc1 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructConstantValueAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructConstantValueAttribute.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
 import java.io.IOException;
 
@@ -24,8 +11,8 @@ public class StructConstantValueAttribute extends StructGeneralAttribute {
   private int index;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    index = stream().readUnsignedShort();
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
+    index = data.readUnsignedShort();
   }
 
   public int getIndex() {
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java
index c9b9ebb..a886b98 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java
@@ -1,24 +1,10 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.struct.consts.LinkConstant;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
-import java.io.DataInputStream;
 import java.io.IOException;
 
 public class StructEnclosingMethodAttribute extends StructGeneralAttribute {
@@ -28,8 +14,7 @@ public class StructEnclosingMethodAttribute extends StructGeneralAttribute {
   private String methodDescriptor;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputStream data = stream();
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
     int classIndex = data.readUnsignedShort();
     int methodIndex = data.readUnsignedShort();
 
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
index 5eda047..a39d902 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
@@ -1,23 +1,9 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
-import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,11 +14,10 @@ public class StructExceptionsAttribute extends StructGeneralAttribute {
   private List<Integer> throwsExceptions;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputStream data = stream();
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
     int len = data.readUnsignedShort();
     if (len > 0) {
-      throwsExceptions = new ArrayList<Integer>(len);
+      throwsExceptions = new ArrayList<>(len);
       for (int i = 0; i < len; i++) {
         throwsExceptions.add(data.readUnsignedShort());
       }
@@ -43,7 +28,7 @@ public class StructExceptionsAttribute extends StructGeneralAttribute {
   }
 
   public String getExcClassname(int index, ConstantPool pool) {
-    return pool.getPrimitiveConstant(throwsExceptions.get(index).intValue()).getString();
+    return pool.getPrimitiveConstant(throwsExceptions.get(index)).getString();
   }
 
   public List<Integer> getThrowsExceptions() {
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
index dc0ebc6..f421671 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
@@ -28,78 +14,88 @@ import java.io.IOException;
   }
 */
 public class StructGeneralAttribute {
+  public static final Key<StructGeneralAttribute> ATTRIBUTE_CODE = new Key<>("Code");
+  public static final Key<StructInnerClassesAttribute> ATTRIBUTE_INNER_CLASSES = new Key<>("InnerClasses");
+  public static final Key<StructGenericSignatureAttribute> ATTRIBUTE_SIGNATURE = new Key<>("Signature");
+  public static final Key<StructAnnDefaultAttribute> ATTRIBUTE_ANNOTATION_DEFAULT = new Key<>("AnnotationDefault");
+  public static final Key<StructExceptionsAttribute> ATTRIBUTE_EXCEPTIONS = new Key<>("Exceptions");
+  public static final Key<StructEnclosingMethodAttribute> ATTRIBUTE_ENCLOSING_METHOD = new Key<>("EnclosingMethod");
+  public static final Key<StructAnnotationAttribute> ATTRIBUTE_RUNTIME_VISIBLE_ANNOTATIONS = new Key<>("RuntimeVisibleAnnotations");
+  public static final Key<StructAnnotationAttribute> ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS = new Key<>("RuntimeInvisibleAnnotations");
+  public static final Key<StructAnnotationParameterAttribute> ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS = new Key<>("RuntimeVisibleParameterAnnotations");
+  public static final Key<StructAnnotationParameterAttribute> ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS = new Key<>("RuntimeInvisibleParameterAnnotations");
+  public static final Key<StructTypeAnnotationAttribute> ATTRIBUTE_RUNTIME_VISIBLE_TYPE_ANNOTATIONS = new Key<>("RuntimeVisibleTypeAnnotations");
+  public static final Key<StructTypeAnnotationAttribute> ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS = new Key<>("RuntimeInvisibleTypeAnnotations");
+  public static final Key<StructLocalVariableTableAttribute> ATTRIBUTE_LOCAL_VARIABLE_TABLE = new Key<>("LocalVariableTable");
+  public static final Key<StructLocalVariableTypeTableAttribute> ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE = new Key<>("LocalVariableTypeTable");
+  public static final Key<StructConstantValueAttribute> ATTRIBUTE_CONSTANT_VALUE = new Key<>("ConstantValue");
+  public static final Key<StructBootstrapMethodsAttribute> ATTRIBUTE_BOOTSTRAP_METHODS = new Key<>("BootstrapMethods");
+  public static final Key<StructGeneralAttribute> ATTRIBUTE_SYNTHETIC = new Key<>("Synthetic");
+  public static final Key<StructGeneralAttribute> ATTRIBUTE_DEPRECATED = new Key<>("Deprecated");
+  public static final Key<StructLineNumberTableAttribute> ATTRIBUTE_LINE_NUMBER_TABLE = new Key<>("LineNumberTable");
+  public static final Key<StructMethodParametersAttribute> ATTRIBUTE_METHOD_PARAMETERS = new Key<>("MethodParameters");
 
-  public static final String ATTRIBUTE_CODE = "Code";
-  public static final String ATTRIBUTE_INNER_CLASSES = "InnerClasses";
-  public static final String ATTRIBUTE_SIGNATURE = "Signature";
-  public static final String ATTRIBUTE_ANNOTATION_DEFAULT = "AnnotationDefault";
-  public static final String ATTRIBUTE_EXCEPTIONS = "Exceptions";
-  public static final String ATTRIBUTE_ENCLOSING_METHOD = "EnclosingMethod";
-  public static final String ATTRIBUTE_RUNTIME_VISIBLE_ANNOTATIONS = "RuntimeVisibleAnnotations";
-  public static final String ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS = "RuntimeInvisibleAnnotations";
-  public static final String ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS = "RuntimeVisibleParameterAnnotations";
-  public static final String ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS = "RuntimeInvisibleParameterAnnotations";
-  public static final String ATTRIBUTE_RUNTIME_VISIBLE_TYPE_ANNOTATIONS = "RuntimeVisibleTypeAnnotations";
-  public static final String ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS = "RuntimeInvisibleTypeAnnotations";
-  public static final String ATTRIBUTE_LOCAL_VARIABLE_TABLE = "LocalVariableTable";
-  public static final String ATTRIBUTE_CONSTANT_VALUE = "ConstantValue";
-  public static final String ATTRIBUTE_BOOTSTRAP_METHODS = "BootstrapMethods";
-  public static final String ATTRIBUTE_SYNTHETIC = "Synthetic";
-  public static final String ATTRIBUTE_DEPRECATED = "Deprecated";
-  public static final String ATTRIBUTE_LINE_NUMBER_TABLE = "LineNumberTable";
-  public static final String ATTRIBUTE_SOURCE_FILE = "SourceFile";
+  public static class Key<T extends StructGeneralAttribute> {
+    private final String name;
+
+    public Key(String name) {
+      this.name = name;
+    }
+
+    public String getName() {
+      return name;
+    }
+  }
 
   private String name;
-  private byte[] info;
 
   public static StructGeneralAttribute createAttribute(String name) {
     StructGeneralAttribute attr;
 
-    if (ATTRIBUTE_INNER_CLASSES.equals(name)) {
+    if (ATTRIBUTE_INNER_CLASSES.getName().equals(name)) {
       attr = new StructInnerClassesAttribute();
     }
-    else if (ATTRIBUTE_CONSTANT_VALUE.equals(name)) {
+    else if (ATTRIBUTE_CONSTANT_VALUE.getName().equals(name)) {
       attr = new StructConstantValueAttribute();
     }
-    else if (ATTRIBUTE_SIGNATURE.equals(name)) {
+    else if (ATTRIBUTE_SIGNATURE.getName().equals(name)) {
       attr = new StructGenericSignatureAttribute();
     }
-    else if (ATTRIBUTE_ANNOTATION_DEFAULT.equals(name)) {
+    else if (ATTRIBUTE_ANNOTATION_DEFAULT.getName().equals(name)) {
       attr = new StructAnnDefaultAttribute();
     }
-    else if (ATTRIBUTE_EXCEPTIONS.equals(name)) {
+    else if (ATTRIBUTE_EXCEPTIONS.getName().equals(name)) {
       attr = new StructExceptionsAttribute();
     }
-    else if (ATTRIBUTE_ENCLOSING_METHOD.equals(name)) {
+    else if (ATTRIBUTE_ENCLOSING_METHOD.getName().equals(name)) {
       attr = new StructEnclosingMethodAttribute();
     }
-    else if (ATTRIBUTE_RUNTIME_VISIBLE_ANNOTATIONS.equals(name) ||
-             ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS.equals(name)) {
+    else if (ATTRIBUTE_RUNTIME_VISIBLE_ANNOTATIONS.getName().equals(name) || ATTRIBUTE_RUNTIME_INVISIBLE_ANNOTATIONS.getName().equals(name)) {
       attr = new StructAnnotationAttribute();
     }
-    else if (ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS.equals(name) ||
-             ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS.equals(name)) {
+    else if (ATTRIBUTE_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS.getName().equals(name) || ATTRIBUTE_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS.getName().equals(name)) {
       attr = new StructAnnotationParameterAttribute();
     }
-    else if (ATTRIBUTE_RUNTIME_VISIBLE_TYPE_ANNOTATIONS.equals(name) ||
-             ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS.equals(name)) {
-      attr = new StructAnnotationTypeAttribute();
+    else if (ATTRIBUTE_RUNTIME_VISIBLE_TYPE_ANNOTATIONS.getName().equals(name) || ATTRIBUTE_RUNTIME_INVISIBLE_TYPE_ANNOTATIONS.getName().equals(name)) {
+      attr = new StructTypeAnnotationAttribute();
     }
-    else if (ATTRIBUTE_LOCAL_VARIABLE_TABLE.equals(name)) {
+    else if (ATTRIBUTE_LOCAL_VARIABLE_TABLE.getName().equals(name)) {
       attr = new StructLocalVariableTableAttribute();
     }
-    else if (ATTRIBUTE_BOOTSTRAP_METHODS.equals(name)) {
+    else if (ATTRIBUTE_LOCAL_VARIABLE_TYPE_TABLE.getName().equals(name)) {
+      attr = new StructLocalVariableTypeTableAttribute();
+    }
+    else if (ATTRIBUTE_BOOTSTRAP_METHODS.getName().equals(name)) {
       attr = new StructBootstrapMethodsAttribute();
     }
-    else if (ATTRIBUTE_SYNTHETIC.equals(name) ||
-             ATTRIBUTE_DEPRECATED.equals(name)) {
+    else if (ATTRIBUTE_SYNTHETIC.getName().equals(name) || ATTRIBUTE_DEPRECATED.getName().equals(name)) {
       attr = new StructGeneralAttribute();
     }
-    else if (ATTRIBUTE_LINE_NUMBER_TABLE.equals(name)) {
+    else if (ATTRIBUTE_LINE_NUMBER_TABLE.getName().equals(name)) {
       attr = new StructLineNumberTableAttribute();
     }
-    else if (ATTRIBUTE_SOURCE_FILE.equals(name)) {
-      attr = new StructSourceFileAttribute();
+    else if (ATTRIBUTE_METHOD_PARAMETERS.getName().equals(name)) {
+      attr = new StructMethodParametersAttribute();
     }
     else {
       // unsupported attribute
@@ -110,17 +106,9 @@ public class StructGeneralAttribute {
     return attr;
   }
 
-  protected DataInputFullStream stream() {
-    return new DataInputFullStream(info);
-  }
-
-  public void initContent(ConstantPool pool) throws IOException { }
-
-  public void setInfo(byte[] info) {
-    this.info = info;
-  }
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException { }
 
   public String getName() {
     return name;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructGenericSignatureAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructGenericSignatureAttribute.java
index 62c892f..d3de832 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructGenericSignatureAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructGenericSignatureAttribute.java
@@ -1,21 +1,8 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
 import java.io.IOException;
 
@@ -24,8 +11,8 @@ public class StructGenericSignatureAttribute extends StructGeneralAttribute {
   private String signature;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    int index = stream().readUnsignedShort();
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
+    int index = data.readUnsignedShort();
     signature = pool.getPrimitiveConstant(index).getString();
   }
 
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
index 5969487..4306381 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
@@ -1,72 +1,60 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
-import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 public class StructInnerClassesAttribute extends StructGeneralAttribute {
+  public static class Entry {
+    public final int outerNameIdx;
+    public final int simpleNameIdx;
+    public final int accessFlags;
+    public final String innerName;
+    public final String enclosingName;
+    public final String simpleName;
 
-  private List<int[]> classEntries;
-  private List<String[]> stringEntries;
+    private Entry(int outerNameIdx, int simpleNameIdx, int accessFlags, String innerName, String enclosingName, String simpleName) {
+      this.outerNameIdx = outerNameIdx;
+      this.simpleNameIdx = simpleNameIdx;
+      this.accessFlags = accessFlags;
+      this.innerName = innerName;
+      this.enclosingName = enclosingName;
+      this.simpleName = simpleName;
+    }
+  }
+
+  private List<Entry> entries;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputStream data = stream();
-
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
     int len = data.readUnsignedShort();
     if (len > 0) {
-      classEntries = new ArrayList<int[]>(len);
-      stringEntries = new ArrayList<String[]>(len);
+      entries = new ArrayList<>(len);
 
       for (int i = 0; i < len; i++) {
-        int[] classEntry = new int[4];
-        for (int j = 0; j < 4; j++) {
-          classEntry[j] = data.readUnsignedShort();
-        }
-        classEntries.add(classEntry);
+        int innerNameIdx = data.readUnsignedShort();
+        int outerNameIdx = data.readUnsignedShort();
+        int simpleNameIdx = data.readUnsignedShort();
+        int accessFlags = data.readUnsignedShort();
 
-        // inner name, enclosing class, original simple name
-        String[] stringEntry = new String[3];
-        stringEntry[0] = pool.getPrimitiveConstant(classEntry[0]).getString();
-        if (classEntry[1] != 0) {
-          stringEntry[1] = pool.getPrimitiveConstant(classEntry[1]).getString();
-        }
-        if (classEntry[2] != 0) {
-          stringEntry[2] = pool.getPrimitiveConstant(classEntry[2]).getString();
-        }
-        stringEntries.add(stringEntry);
+        String innerName = pool.getPrimitiveConstant(innerNameIdx).getString();
+        String outerName = outerNameIdx != 0 ? pool.getPrimitiveConstant(outerNameIdx).getString() : null;
+        String simpleName = simpleNameIdx != 0 ? pool.getPrimitiveConstant(simpleNameIdx).getString() : null;
+
+        entries.add(new Entry(outerNameIdx, simpleNameIdx, accessFlags, innerName, outerName, simpleName));
       }
     }
     else {
-      classEntries = Collections.emptyList();
-      stringEntries = Collections.emptyList();
+      entries = Collections.emptyList();
     }
   }
 
-  public List<int[]> getClassEntries() {
-    return classEntries;
+  public List<Entry> getEntries() {
+    return entries;
   }
-
-  public List<String[]> getStringEntries() {
-    return stringEntries;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLineNumberTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLineNumberTableAttribute.java
index 3cd757b..e641b39 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLineNumberTableAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLineNumberTableAttribute.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
@@ -33,9 +19,7 @@ public class StructLineNumberTableAttribute extends StructGeneralAttribute {
   private int[] myLineInfo = InterpreterUtil.EMPTY_INT_ARRAY;
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputFullStream data = stream();
-
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
     int len = data.readUnsignedShort() * 2;
     if (len > 0) {
       myLineInfo = new int[len];
@@ -49,10 +33,6 @@ public class StructLineNumberTableAttribute extends StructGeneralAttribute {
     }
   }
 
-  public int getFirstLine() {
-    return myLineInfo.length > 0 ? myLineInfo[1] : -1;
-  }
-
   public int findLineNumber(int pc) {
     if (myLineInfo.length >= 2) {
       for (int i = myLineInfo.length - 2; i >= 0; i -= 2) {
@@ -67,4 +47,4 @@ public class StructLineNumberTableAttribute extends StructGeneralAttribute {
   public int[] getRawData() {
     return myLineInfo;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
index fceae35..15fb317 100644
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
@@ -1,27 +1,13 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.attr;
 
 import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
 import org.jetbrains.java.decompiler.util.DataInputFullStream;
 
 import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /*
   u2 local_variable_table_length;
@@ -34,34 +20,70 @@ import java.util.Map;
   }
 */
 public class StructLocalVariableTableAttribute extends StructGeneralAttribute {
-
-  private Map<Integer, String> mapVarNames = Collections.emptyMap();
+  private List<LocalVariable> localVariables = Collections.emptyList();
 
   @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    DataInputFullStream data = stream();
-
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
     int len = data.readUnsignedShort();
     if (len > 0) {
-      mapVarNames = new HashMap<Integer, String>(len);
+      localVariables = new ArrayList<>(len);
+
       for (int i = 0; i < len; i++) {
-        data.discard(4);
+        int start_pc = data.readUnsignedShort();
+        int length = data.readUnsignedShort();
         int nameIndex = data.readUnsignedShort();
-        data.discard(2);
+        int descriptorIndex = data.readUnsignedShort();
         int varIndex = data.readUnsignedShort();
-        mapVarNames.put(varIndex, pool.getPrimitiveConstant(nameIndex).getString());
+        localVariables.add(new LocalVariable(start_pc,
+                                             length,
+                                             pool.getPrimitiveConstant(nameIndex).getString(),
+                                             pool.getPrimitiveConstant(descriptorIndex).getString(),
+                                             varIndex));
       }
     }
     else {
-      mapVarNames = Collections.emptyMap();
+      localVariables = Collections.emptyList();
     }
   }
 
-  public void addLocalVariableTable(StructLocalVariableTableAttribute attr) {
-    mapVarNames.putAll(attr.getMapVarNames());
+  public void add(StructLocalVariableTableAttribute attr) {
+    localVariables.addAll(attr.localVariables);
   }
 
-  public Map<Integer, String> getMapVarNames() {
-    return mapVarNames;
+  public String getName(int index, int visibleOffset) {
+    return matchingVars(index, visibleOffset).map(v -> v.name).findFirst().orElse(null);
+  }
+
+  public String getDescriptor(int index, int visibleOffset) {
+    return matchingVars(index, visibleOffset).map(v -> v.descriptor).findFirst().orElse(null);
+  }
+
+  private Stream<LocalVariable> matchingVars(int index, int visibleOffset) {
+    return localVariables.stream()
+      .filter(v -> v.index == index && (visibleOffset >= v.start_pc && visibleOffset < v.start_pc + v.length));
+  }
+
+  public boolean containsName(String name) {
+    return localVariables.stream().anyMatch(v -> Objects.equals(v.name, name));
+  }
+
+  public Map<Integer, String> getMapParamNames() {
+    return localVariables.stream().filter(v -> v.start_pc == 0).collect(Collectors.toMap(v -> v.index, v -> v.name, (n1, n2) -> n2));
+  }
+
+  private static class LocalVariable {
+    final int start_pc;
+    final int length;
+    final String name;
+    final String descriptor;
+    final int index;
+
+    private LocalVariable(int start_pc, int length, String name, String descriptor, int index) {
+      this.start_pc = start_pc;
+      this.length = length;
+      this.name = name;
+      this.descriptor = descriptor;
+      this.index = index;
+    }
   }
 }
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
new file mode 100644
index 0000000..829c78e
--- /dev/null
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTypeTableAttribute.java
@@ -0,0 +1,34 @@
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.java.decompiler.struct.attr;
+
+import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
+
+import java.io.IOException;
+
+/*
+  u2 local_variable_type_table_length;
+    {   u2 start_pc;
+        u2 length;
+        u2 name_index;
+        u2 signature_index;
+        u2 index;
+    } local_variable_type_table[local_variable_type_table_length];
+*/
+public class StructLocalVariableTypeTableAttribute extends StructGeneralAttribute {
+  // store signature instead of descriptor
+  private final StructLocalVariableTableAttribute backingAttribute = new StructLocalVariableTableAttribute();
+
+  @Override
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
+    backingAttribute.initContent(data, pool);
+  }
+
+  public void add(StructLocalVariableTypeTableAttribute attr) {
+    backingAttribute.add(attr.backingAttribute);
+  }
+
+  public String getSignature(int index, int visibleOffset) {
+    return backingAttribute.getDescriptor(index, visibleOffset);
+  }
+}
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructMethodParametersAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructMethodParametersAttribute.java
new file mode 100644
index 0000000..08133a9
--- /dev/null
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructMethodParametersAttribute.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+ */
+package org.jetbrains.java.decompiler.struct.attr;
+
+import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/*
+  u1 parameters_count;
+  {   u2 name_index;
+      u2 access_flags;
+  } parameters[parameters_count];
+*/
+public class StructMethodParametersAttribute extends StructGeneralAttribute {
+  private List<Entry> myEntries;
+
+  @Override
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
+    int len = data.readUnsignedByte();
+    List<Entry> entries;
+    if (len > 0) {
+      entries = new ArrayList<>(len);
+
+      for (int i = 0; i < len; i++) {
+        int nameIndex = data.readUnsignedShort();
+        String name = nameIndex != 0 ? pool.getPrimitiveConstant(nameIndex).getString() : null;
+        int access_flags = data.readUnsignedShort();
+        entries.add(new Entry(name, access_flags));
+      }
+    }
+    else {
+      entries = Collections.emptyList();
+    }
+    myEntries = Collections.unmodifiableList(entries);
+  }
+
+  public List<Entry> getEntries() {
+    return myEntries;
+  }
+
+  public static class Entry {
+    public final String myName;
+    public final int myAccessFlags;
+
+    public Entry(String name, int accessFlags) {
+      myName = name;
+      myAccessFlags = accessFlags;
+    }
+  }
+}
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructSourceFileAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructSourceFileAttribute.java
deleted file mode 100644
index 596d30f..0000000
--- a/src/org/jetbrains/java/decompiler/struct/attr/StructSourceFileAttribute.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.struct.attr;
-
-import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
-
-import java.io.IOException;
-
-public class StructSourceFileAttribute extends StructGeneralAttribute {
-
-  private String fileName;
-
-  @Override
-  public void initContent(ConstantPool pool) throws IOException {
-    int index = stream().readUnsignedShort();
-    fileName = pool.getPrimitiveConstant(index).getString();
-  }
-
-  public String getFileName() {
-    return fileName;
-  }
-}
diff --git a/src/org/jetbrains/java/decompiler/struct/attr/StructTypeAnnotationAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructTypeAnnotationAttribute.java
new file mode 100644
index 0000000..a202940
--- /dev/null
+++ b/src/org/jetbrains/java/decompiler/struct/attr/StructTypeAnnotationAttribute.java
@@ -0,0 +1,92 @@
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.java.decompiler.struct.attr;
+
+import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent;
+import org.jetbrains.java.decompiler.modules.decompiler.exps.TypeAnnotation;
+import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
+import org.jetbrains.java.decompiler.util.DataInputFullStream;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class StructTypeAnnotationAttribute extends StructGeneralAttribute {
+  private List<TypeAnnotation> annotations = Collections.emptyList();
+
+  @Override
+  public void initContent(DataInputFullStream data, ConstantPool pool) throws IOException {
+    int len = data.readUnsignedShort();
+    if (len > 0) {
+      annotations = new ArrayList<>(len);
+      for (int i = 0; i < len; i++) {
+        annotations.add(parse(data, pool));
+      }
+    }
+    else {
+      annotations = Collections.emptyList();
+    }
+  }
+
+  private static TypeAnnotation parse(DataInputStream data, ConstantPool pool) throws IOException {
+    int targetType = data.readUnsignedByte();
+    int target = targetType << 24;
+
+    switch (targetType) {
+      case TypeAnnotation.CLASS_TYPE_PARAMETER:
+      case TypeAnnotation.METHOD_TYPE_PARAMETER:
+      case TypeAnnotation.METHOD_PARAMETER:
+        target |= data.readUnsignedByte();
+        break;
+
+      case TypeAnnotation.SUPER_TYPE_REFERENCE:
+      case TypeAnnotation.CLASS_TYPE_PARAMETER_BOUND:
+      case TypeAnnotation.METHOD_TYPE_PARAMETER_BOUND:
+      case TypeAnnotation.THROWS_REFERENCE:
+      case TypeAnnotation.CATCH_CLAUSE:
+      case TypeAnnotation.EXPR_INSTANCEOF:
+      case TypeAnnotation.EXPR_NEW:
+      case TypeAnnotation.EXPR_CONSTRUCTOR_REF:
+      case TypeAnnotation.EXPR_METHOD_REF:
+        target |= data.readUnsignedShort();
+        break;
+
+      case TypeAnnotation.TYPE_ARG_CAST:
+      case TypeAnnotation.TYPE_ARG_CONSTRUCTOR_CALL:
+      case TypeAnnotation.TYPE_ARG_METHOD_CALL:
+      case TypeAnnotation.TYPE_ARG_CONSTRUCTOR_REF:
+      case TypeAnnotation.TYPE_ARG_METHOD_REF:
+        data.skipBytes(3);
+        break;
+
+      case TypeAnnotation.LOCAL_VARIABLE:
+      case TypeAnnotation.RESOURCE_VARIABLE:
+        data.skipBytes(data.readUnsignedShort() * 6);
+        break;
+
+      case TypeAnnotation.FIELD:
+      case TypeAnnotation.METHOD_RETURN_TYPE:
+      case TypeAnnotation.METHOD_RECEIVER:
+        break;
+
+      default:
+        throw new RuntimeException("unknown target type: " + targetType);
+    }
+
+    int pathLength = data.readUnsignedByte();
+    byte[] path = null;
+    if (pathLength > 0) {
+      path = new byte[2 * pathLength];
+      data.readFully(path);
+    }
+
+    AnnotationExprent annotation = StructAnnotationAttribute.parseAnnotation(data, pool);
+
+    return new TypeAnnotation(target, path, annotation);
+  }
+
+  public List<TypeAnnotation> getAnnotations() {
+    return annotations;
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
index aa9ed9c..0ea6e01 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.consts;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -27,20 +13,21 @@ import org.jetbrains.java.decompiler.util.DataInputFullStream;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.BitSet;
 import java.util.List;
 
+@SuppressWarnings("AssignmentToForLoopParameter")
 public class ConstantPool implements NewClassNameBuilder {
-
   public static final int FIELD = 1;
   public static final int METHOD = 2;
 
-  private final List<PooledConstant> pool = new ArrayList<PooledConstant>();
+  private final List<PooledConstant> pool;
   private final PoolInterceptor interceptor;
 
-
   public ConstantPool(DataInputStream in) throws IOException {
     int size = in.readUnsignedShort();
-    int[] pass = new int[size];
+    pool = new ArrayList<>(size);
+    BitSet[] nextPass = {new BitSet(size), new BitSet(size), new BitSet(size)};
 
     // first dummy constant
     pool.add(null);
@@ -53,54 +40,59 @@ public class ConstantPool implements NewClassNameBuilder {
         case CodeConstants.CONSTANT_Utf8:
           pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Utf8, in.readUTF()));
           break;
+
         case CodeConstants.CONSTANT_Integer:
-          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Integer, new Integer(in.readInt())));
+          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Integer, Integer.valueOf(in.readInt())));
           break;
+
         case CodeConstants.CONSTANT_Float:
-          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Float, new Float(in.readFloat())));
+          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Float, in.readFloat()));
           break;
+
         case CodeConstants.CONSTANT_Long:
-          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Long, new Long(in.readLong())));
+          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Long, in.readLong()));
           pool.add(null);
           i++;
           break;
+
         case CodeConstants.CONSTANT_Double:
-          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Double, new Double(in.readDouble())));
+          pool.add(new PrimitiveConstant(CodeConstants.CONSTANT_Double, in.readDouble()));
           pool.add(null);
           i++;
           break;
+
         case CodeConstants.CONSTANT_Class:
         case CodeConstants.CONSTANT_String:
         case CodeConstants.CONSTANT_MethodType:
           pool.add(new PrimitiveConstant(tag, in.readUnsignedShort()));
-          pass[i] = 1;
+          nextPass[0].set(i);
           break;
+
+        case CodeConstants.CONSTANT_NameAndType:
+          pool.add(new LinkConstant(tag, in.readUnsignedShort(), in.readUnsignedShort()));
+          nextPass[0].set(i);
+          break;
+
         case CodeConstants.CONSTANT_Fieldref:
         case CodeConstants.CONSTANT_Methodref:
         case CodeConstants.CONSTANT_InterfaceMethodref:
-        case CodeConstants.CONSTANT_NameAndType:
         case CodeConstants.CONSTANT_InvokeDynamic:
           pool.add(new LinkConstant(tag, in.readUnsignedShort(), in.readUnsignedShort()));
-          if (tag == CodeConstants.CONSTANT_NameAndType) {
-            pass[i] = 1;
-          }
-          else {
-            pass[i] = 2;
-          }
+          nextPass[1].set(i);
           break;
+
         case CodeConstants.CONSTANT_MethodHandle:
           pool.add(new LinkConstant(tag, in.readUnsignedByte(), in.readUnsignedShort()));
-          pass[i] = 3;
+          nextPass[2].set(i);
           break;
       }
     }
 
     // resolving complex pool elements
-    for (int passIndex = 1; passIndex <= 3; passIndex++) {
-      for (int i = 1; i < size; i++) {
-        if (pass[i] == passIndex) {
-          pool.get(i).resolveConstant(this);
-        }
+    for (BitSet pass : nextPass) {
+      int idx = 0;
+      while ((idx = pass.nextSetBit(idx + 1)) > 0) {
+        pool.get(idx).resolveConstant(this);
       }
     }
 
@@ -116,6 +108,7 @@ public class ConstantPool implements NewClassNameBuilder {
         case CodeConstants.CONSTANT_Utf8:
           in.readUTF();
           break;
+
         case CodeConstants.CONSTANT_Integer:
         case CodeConstants.CONSTANT_Float:
         case CodeConstants.CONSTANT_Fieldref:
@@ -125,32 +118,36 @@ public class ConstantPool implements NewClassNameBuilder {
         case CodeConstants.CONSTANT_InvokeDynamic:
           in.discard(4);
           break;
+
         case CodeConstants.CONSTANT_Long:
         case CodeConstants.CONSTANT_Double:
           in.discard(8);
           i++;
           break;
+
         case CodeConstants.CONSTANT_Class:
         case CodeConstants.CONSTANT_String:
         case CodeConstants.CONSTANT_MethodType:
           in.discard(2);
           break;
+
         case CodeConstants.CONSTANT_MethodHandle:
           in.discard(3);
       }
     }
   }
 
-  public int size() {
-    return pool.size();
-  }
-
   public String[] getClassElement(int elementType, String className, int nameIndex, int descriptorIndex) {
     String elementName = ((PrimitiveConstant)getConstant(nameIndex)).getString();
     String descriptor = ((PrimitiveConstant)getConstant(descriptorIndex)).getString();
 
     if (interceptor != null) {
-      String newElement = interceptor.getName(className + " " + elementName + " " + descriptor);
+      String oldClassName = interceptor.getOldName(className);
+      if (oldClassName != null) {
+        className = oldClassName;
+      }
+
+      String newElement = interceptor.getName(className + ' ' + elementName + ' ' + descriptor);
       if (newElement != null) {
         elementName = newElement.split(" ")[1];
       }
@@ -191,9 +188,10 @@ public class ConstantPool implements NewClassNameBuilder {
          ln.type == CodeConstants.CONSTANT_Methodref ||
          ln.type == CodeConstants.CONSTANT_InterfaceMethodref)) {
       String newClassName = buildNewClassname(ln.classname);
-      String newElement = interceptor.getName(ln.classname + " " + ln.elementname + " " + ln.descriptor);
+      String newElement = interceptor.getName(ln.classname + ' ' + ln.elementname + ' ' + ln.descriptor);
       String newDescriptor = buildNewDescriptor(ln.type == CodeConstants.CONSTANT_Fieldref, ln.descriptor);
-
+      //TODO: Fix newElement being null caused by ln.classname being a leaf class instead of the class that declared the field/method.
+      //See the comments of IDEA-137253 for more information.
       if (newClassName != null || newElement != null || newDescriptor != null) {
         String className = newClassName == null ? ln.classname : newClassName;
         String elementName = newElement == null ? ln.elementname : newElement.split(" ")[1];
@@ -215,10 +213,10 @@ public class ConstantPool implements NewClassNameBuilder {
 
       if (vt.arrayDim > 0) {
         for (int i = 0; i < vt.arrayDim; i++) {
-          buffer.append("[");
+          buffer.append('[');
         }
 
-        buffer.append("L").append(newName).append(";");
+        buffer.append('L').append(newName).append(';');
       }
       else {
         buffer.append(newName);
@@ -238,4 +236,4 @@ public class ConstantPool implements NewClassNameBuilder {
       return MethodDescriptor.parseDescriptor(descriptor).buildNewDescriptor(this);
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java b/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java
index 71bf146..d8a92ca 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java
@@ -1,55 +1,14 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.consts;
 
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-/*
- *   NameAndType, FieldRef, MethodRef, InterfaceMethodref
- *   InvokeDynamic, MethodHandle
- */
-
 public class LinkConstant extends PooledConstant {
-
-  // *****************************************************************************
-  // public fields
-  // *****************************************************************************
-
   public int index1, index2;
-
   public String classname;
-
   public String elementname;
-
   public String descriptor;
 
-  public int paramCount = 0;
-
-  public boolean isVoid = false;
-
-  public boolean returnCategory2 = false;
-
-
-  // *****************************************************************************
-  // constructors
-  // *****************************************************************************
-
   public LinkConstant(int type, String classname, String elementname, String descriptor) {
-    this.type = type;
+    super(type);
     this.classname = classname;
     this.elementname = elementname;
     this.descriptor = descriptor;
@@ -58,18 +17,25 @@ public class LinkConstant extends PooledConstant {
   }
 
   public LinkConstant(int type, int index1, int index2) {
-    this.type = type;
+    super(type);
     this.index1 = index1;
     this.index2 = index2;
   }
 
+  private void initConstant() {
+    if (type == CONSTANT_Methodref ||
+        type == CONSTANT_InterfaceMethodref ||
+        type == CONSTANT_InvokeDynamic ||
+        type == CONSTANT_MethodHandle) {
+      int parenth = descriptor.indexOf(')');
+      if (descriptor.length() < 2 || parenth < 0 || descriptor.charAt(0) != '(') {
+        throw new IllegalArgumentException("Invalid descriptor: " + descriptor);
+      }
+    }
+  }
 
-  // *****************************************************************************
-  // public methods
-  // *****************************************************************************
-
+  @Override
   public void resolveConstant(ConstantPool pool) {
-
     if (type == CONSTANT_NameAndType) {
       elementname = pool.getPrimitiveConstant(index1).getString();
       descriptor = pool.getPrimitiveConstant(index2).getString();
@@ -94,21 +60,10 @@ public class LinkConstant extends PooledConstant {
     initConstant();
   }
 
-  public void writeToStream(DataOutputStream out) throws IOException {
-    out.writeByte(type);
-    if (type == CONSTANT_MethodHandle) {
-      out.writeByte(index1);
-    }
-    else {
-      out.writeShort(index1);
-    }
-    out.writeShort(index2);
-  }
-
-
+  @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof LinkConstant)) return false;
+    if (!(o instanceof LinkConstant)) return false;
 
     LinkConstant cn = (LinkConstant)o;
     return this.type == cn.type &&
@@ -116,50 +71,4 @@ public class LinkConstant extends PooledConstant {
            this.descriptor.equals(cn.descriptor) &&
            (this.type != CONSTANT_NameAndType || this.classname.equals(cn.classname));
   }
-
-  // *****************************************************************************
-  // private methods
-  // *****************************************************************************
-
-  private void initConstant() {
-
-    if (type == CONSTANT_Methodref ||
-        type == CONSTANT_InterfaceMethodref ||
-        type == CONSTANT_InvokeDynamic ||
-        type == CONSTANT_MethodHandle) {
-      resolveDescriptor(descriptor);
-    }
-    else if (type == CONSTANT_Fieldref) {
-      returnCategory2 = ("D".equals(descriptor) || "J".equals(descriptor));
-    }
-  }
-
-  private void resolveDescriptor(String descr) {
-
-    String[] arr = descr.split("[()]");
-    String par = arr[1];
-
-    int index = 0, counter = 0;
-    int len = par.length();
-
-    while (index < len) {
-
-      char c = par.charAt(index);
-      if (c == 'L') {
-        index = par.indexOf(";", index);
-      }
-      else if (c == '[') {
-        index++;
-        continue;
-      }
-
-      counter++;
-      index++;
-    }
-
-    paramCount = counter;
-    isVoid = "V".equals(arr[2]);
-    returnCategory2 = ("D".equals(arr[2]) || "J".equals(arr[2]));
-  }
-}
-
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/PooledConstant.java b/src/org/jetbrains/java/decompiler/struct/consts/PooledConstant.java
index d3d30c0..7486fb3 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/PooledConstant.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/PooledConstant.java
@@ -1,117 +1,14 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.consts;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 
-import java.io.DataOutputStream;
-import java.io.IOException;
+public class PooledConstant implements CodeConstants {
+  public final int type;
 
-/*
-    cp_info {
-    	u1 tag;
-    	u1 info[];
-    }
-    
-*/
-
-public class PooledConstant implements CodeConstants, VariableTypeEnum {
-
-  // *****************************************************************************
-  // public fields
-  // *****************************************************************************
-
-  public int type;
-
-  public boolean own = false;
-
-  public int returnType;
-
-
-  // *****************************************************************************
-  // private fields
-  // *****************************************************************************
-
-  private Object[] values;
-
-  // *****************************************************************************
-  // constructors
-  // *****************************************************************************
-
-  public PooledConstant() {
-  }
-
-  public PooledConstant(int type, Object[] values) {
+  public PooledConstant(int type) {
     this.type = type;
-    this.values = values;
-    this.returnType = poolTypeToIntern(type);
   }
 
-  public PooledConstant(int type, boolean own, Object[] values) {
-    this.type = type;
-    this.own = own;
-    this.values = values;
-    this.returnType = poolTypeToIntern(type);
-  }
-
-  // *****************************************************************************
-  // public methods
-  // *****************************************************************************
-
-  public void resolveConstant(ConstantPool pool) {
-    // to be overwritten
-  }
-
-  public void writeToStream(DataOutputStream out) throws IOException {
-    // to be overwritten
-  }
-
-  public int poolTypeToIntern(int type) {
-
-    switch (type) {
-      case CONSTANT_Integer:
-        return INT;
-      case CONSTANT_Float:
-        return FLOAT;
-      case CONSTANT_Long:
-        return LONG;
-      case CONSTANT_Double:
-        return DOUBLE;
-      case CONSTANT_String:
-      case CONSTANT_Class:  // 1.5 -> ldc class
-        return REFERENCE;
-      default:
-        throw new RuntimeException("Huh?? What are you trying to load?");
-    }
-  }
-
-  public Object getValue(int index) {
-    return values[index];
-  }
-
-
-  // *****************************************************************************
-  // getter and setter methods
-  // *****************************************************************************
-
-  public Object[] getValues() {
-    return values;
-  }
-
-  public void setValues(Object[] values) {
-    this.values = values;
-  }
-}
+  public void resolveConstant(ConstantPool pool) { }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java b/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java
index 4cd4dd8..626a91b 100644
--- a/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java
+++ b/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java
@@ -1,126 +1,50 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.consts;
 
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-/*
- *   Integer, Long, Float, Double, String, Class, UTF8
- */
-
 public class PrimitiveConstant extends PooledConstant {
-
-  // *****************************************************************************
-  // public fields
-  // *****************************************************************************
-
   public int index;
-
   public Object value;
-
   public boolean isArray;
 
-  // *****************************************************************************
-  // constructors
-  // *****************************************************************************
-
   public PrimitiveConstant(int type, Object value) {
-    this.type = type;
+    super(type);
     this.value = value;
 
     initConstant();
   }
 
   public PrimitiveConstant(int type, int index) {
-    this.type = type;
+    super(type);
     this.index = index;
   }
 
-  // *****************************************************************************
-  // public methods
-  // *****************************************************************************
-
-  public int getInt() {
-    return ((Integer)value).intValue();
-  }
-
-  public long getLong() {
-    return ((Long)value).longValue();
-  }
-
-  public float getFloat() {
-    return ((Float)value).floatValue();
-  }
-
-  public double getDouble() {
-    return ((Double)value).doubleValue();
+  private void initConstant() {
+    if (type == CONSTANT_Class) {
+      String className = getString();
+      isArray = (className.length() > 0 && className.charAt(0) == '['); // empty string for a class name seems to be possible in some android files
+    }
   }
 
   public String getString() {
     return (String)value;
   }
 
+  @Override
   public void resolveConstant(ConstantPool pool) {
-
     if (type == CONSTANT_Class || type == CONSTANT_String || type == CONSTANT_MethodType) {
       value = pool.getPrimitiveConstant(index).getString();
       initConstant();
     }
   }
 
-  public void writeToStream(DataOutputStream out) throws IOException {
-
-    out.writeByte(type);
-    switch (type) {
-      case CONSTANT_Integer:
-        out.writeInt(getInt());
-        break;
-      case CONSTANT_Float:
-        out.writeFloat(getFloat());
-        break;
-      case CONSTANT_Long:
-        out.writeLong(getLong());
-        break;
-      case CONSTANT_Double:
-        out.writeDouble(getDouble());
-        break;
-      case CONSTANT_Utf8:
-        out.writeUTF(getString());
-        break;
-      default: // CONSTANT_Class, CONSTANT_String, CONSTANT_MethodType
-        out.writeShort(index);
-    }
-  }
-
+  @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof PrimitiveConstant)) return false;
+    if (!(o instanceof PrimitiveConstant)) return false;
 
     PrimitiveConstant cn = (PrimitiveConstant)o;
     return this.type == cn.type &&
            this.isArray == cn.isArray &&
            this.value.equals(cn.value);
   }
-
-  private void initConstant() {
-    if (type == CONSTANT_Class) {
-      String className = getString();
-      isArray =
-        (className.length() > 0 && className.charAt(0) == '['); // empty string for a class name seems to be possible in some android files
-    }
-  }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/consts/VariableTypeEnum.java b/src/org/jetbrains/java/decompiler/struct/consts/VariableTypeEnum.java
deleted file mode 100644
index 7950d5b..0000000
--- a/src/org/jetbrains/java/decompiler/struct/consts/VariableTypeEnum.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.struct.consts;
-
-public interface VariableTypeEnum {
-
-  int BOOLEAN = 1;
-  int BYTE = 2;
-  int CHAR = 3;
-  int SHORT = 4;
-  int INT = 5;
-  int FLOAT = 6;
-  int LONG = 7;
-  int DOUBLE = 8;
-  int RETURN_ADDRESS = 9;
-  int REFERENCE = 10;
-  int INSTANCE_UNINITIALIZED = 11;
-  int VALUE_UNKNOWN = 12;
-  int VOID = 13;
-
-  Integer BOOLEAN_OBJ = new Integer(BOOLEAN);
-  Integer BYTE_OBJ = new Integer(BYTE);
-  Integer CHAR_OBJ = new Integer(CHAR);
-  Integer SHORT_OBJ = new Integer(SHORT);
-  Integer INT_OBJ = new Integer(INT);
-  Integer FLOAT_OBJ = new Integer(FLOAT);
-  Integer LONG_OBJ = new Integer(LONG);
-  Integer DOUBLE_OBJ = new Integer(DOUBLE);
-  Integer RETURN_ADDRESS_OBJ = new Integer(RETURN_ADDRESS);
-  Integer REFERENCE_OBJ = new Integer(REFERENCE);
-  Integer INSTANCE_UNINITIALIZED_OBJ = new Integer(INSTANCE_UNINITIALIZED);
-  Integer VALUE_UNKNOWN_OBJ = new Integer(VALUE_UNKNOWN);
-  Integer VOID_OBJ = new Integer(VOID);
-}
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java b/src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java
index 506a51f..f3d8562 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -24,9 +10,9 @@ import java.util.List;
 
 public class DataPoint {
 
-  private List<VarType> localVariables = new ArrayList<VarType>();
+  private List<VarType> localVariables = new ArrayList<>();
 
-  private ListStack<VarType> stack = new ListStack<VarType>();
+  private ListStack<VarType> stack = new ListStack<>();
 
 
   public void setVariable(int index, VarType value) {
@@ -43,9 +29,6 @@ public class DataPoint {
     if (index < localVariables.size()) {
       return localVariables.get(index);
     }
-    else if (index < 0) {
-      throw new IndexOutOfBoundsException();
-    }
     else {
       return new VarType(CodeConstants.TYPE_NOTINITIALIZED);
     }
@@ -53,7 +36,7 @@ public class DataPoint {
 
   public DataPoint copy() {
     DataPoint point = new DataPoint();
-    point.setLocalVariables(new ArrayList<VarType>(localVariables));
+    point.setLocalVariables(new ArrayList<>(localVariables));
     point.setStack(stack.clone());
     return point;
   }
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java
index a2fd20c..94add14 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -50,7 +36,7 @@ public class FieldDescriptor {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof FieldDescriptor)) return false;
+    if (!(o instanceof FieldDescriptor)) return false;
 
     FieldDescriptor fd = (FieldDescriptor)o;
     return type.equals(fd.type);
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
index 2465382..102393c 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -22,7 +8,6 @@ import java.util.Arrays;
 import java.util.List;
 
 public class MethodDescriptor {
-
   public final VarType[] params;
   public final VarType ret;
 
@@ -41,7 +26,7 @@ public class MethodDescriptor {
 
     if (parenth > 1) {
       String parameters = descriptor.substring(1, parenth);
-      List<String> lst = new ArrayList<String>();
+      List<String> lst = new ArrayList<>();
 
       int indexFrom = -1, ind, len = parameters.length(), index = 0;
       while (index < len) {
@@ -129,7 +114,7 @@ public class MethodDescriptor {
   @Override
   public boolean equals(Object o) {
     if (o == this) return true;
-    if (o == null || !(o instanceof MethodDescriptor)) return false;
+    if (!(o instanceof MethodDescriptor)) return false;
 
     MethodDescriptor md = (MethodDescriptor)o;
     return ret.equals(md.ret) && Arrays.equals(params, md.params);
@@ -141,4 +126,4 @@ public class MethodDescriptor {
     result = 31 * result + params.length;
     return result;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/NewClassNameBuilder.java b/src/org/jetbrains/java/decompiler/struct/gen/NewClassNameBuilder.java
index 5f03ccd..32b8a5e 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/NewClassNameBuilder.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/NewClassNameBuilder.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen;
 
 public interface NewClassNameBuilder {
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
index 1eb177f..4362f38 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -38,6 +24,10 @@ public class VarType {  // TODO: optimize switch
   public static final VarType VARTYPE_STRING = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/String");
   public static final VarType VARTYPE_CLASS = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Class");
   public static final VarType VARTYPE_OBJECT = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Object");
+  public static final VarType VARTYPE_INTEGER = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Integer");
+  public static final VarType VARTYPE_CHARACTER = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Character");
+  public static final VarType VARTYPE_BYTE_OBJ = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Byte");
+  public static final VarType VARTYPE_SHORT_OBJ = new VarType(CodeConstants.TYPE_OBJECT, 0, "java/lang/Short");
   public static final VarType VARTYPE_VOID = new VarType(CodeConstants.TYPE_VOID);
 
   public final int type;
@@ -92,7 +82,7 @@ public class VarType {  // TODO: optimize switch
           }
 
         default:
-          value = signature.substring(i, signature.length());
+          value = signature.substring(i);
           if ((clType && i == 0) || value.length() > 1) {
             type = CodeConstants.TYPE_OBJECT;
           }
@@ -275,7 +265,7 @@ public class VarType {  // TODO: optimize switch
       return true;
     }
 
-    if (o == null || !(o instanceof VarType)) {
+    if (!(o instanceof VarType)) {
       return false;
     }
 
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
index 2ff2954..ad623a2 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen.generics;
 
 import java.util.ArrayList;
@@ -22,9 +8,9 @@ public class GenericClassDescriptor {
 
   public GenericType superclass;
 
-  public final List<GenericType> superinterfaces = new ArrayList<GenericType>();
+  public final List<GenericType> superinterfaces = new ArrayList<>();
 
-  public final List<String> fparameters = new ArrayList<String>();
+  public final List<String> fparameters = new ArrayList<>();
 
-  public final List<List<GenericType>> fbounds = new ArrayList<List<GenericType>>();
+  public final List<List<GenericType>> fbounds = new ArrayList<>();
 }
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
index 598d17b..a651817 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
@@ -1,21 +1,10 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen.generics;
 
 public class GenericFieldDescriptor {
+  public final GenericType type;
 
-  public GenericType type;
-}
+  public GenericFieldDescriptor(GenericType type) {
+    this.type = type;
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
index 2992078..3e4e1f1 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
@@ -1,24 +1,10 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen.generics;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerLogger;
-import org.jetbrains.java.decompiler.struct.StructClass;
+import org.jetbrains.java.decompiler.util.TextUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -63,9 +49,7 @@ public class GenericMain {
 
   public static GenericFieldDescriptor parseFieldSignature(String signature) {
     try {
-      GenericFieldDescriptor descriptor = new GenericFieldDescriptor();
-      descriptor.type = new GenericType(signature);
-      return descriptor;
+      return new GenericFieldDescriptor(new GenericType(signature));
     }
     catch (RuntimeException e) {
       DecompilerContext.getLogger().writeMessage("Invalid signature: " + signature, IFernflowerLogger.Severity.WARN);
@@ -76,33 +60,34 @@ public class GenericMain {
   public static GenericMethodDescriptor parseMethodSignature(String signature) {
     String original = signature;
     try {
-      GenericMethodDescriptor descriptor = new GenericMethodDescriptor();
-
-      signature = parseFormalParameters(signature, descriptor.fparameters, descriptor.fbounds);
+      List<String> typeParameters = new ArrayList<>();
+      List<List<GenericType>> typeParameterBounds = new ArrayList<>();
+      signature = parseFormalParameters(signature, typeParameters, typeParameterBounds);
 
       int to = signature.indexOf(")");
-      String pars = signature.substring(1, to);
+      String parameters = signature.substring(1, to);
       signature = signature.substring(to + 1);
 
-      while (pars.length() > 0) {
-        String par = GenericType.getNextType(pars);
-        descriptor.params.add(new GenericType(par));
-        pars = pars.substring(par.length());
+      List<GenericType> parameterTypes = new ArrayList<>();
+      while (parameters.length() > 0) {
+        String par = GenericType.getNextType(parameters);
+        parameterTypes.add(new GenericType(par));
+        parameters = parameters.substring(par.length());
       }
 
-      String par = GenericType.getNextType(signature);
-      descriptor.ret = new GenericType(par);
-      signature = signature.substring(par.length());
+      String ret = GenericType.getNextType(signature);
+      GenericType returnType = new GenericType(ret);
+      signature = signature.substring(ret.length());
 
+      List<GenericType> exceptionTypes = new ArrayList<>();
       if (signature.length() > 0) {
         String[] exceptions = signature.split("\\^");
-
         for (int i = 1; i < exceptions.length; i++) {
-          descriptor.exceptions.add(new GenericType(exceptions[i]));
+          exceptionTypes.add(new GenericType(exceptions[i]));
         }
       }
 
-      return descriptor;
+      return new GenericMethodDescriptor(typeParameters, typeParameterBounds, parameterTypes, returnType, exceptionTypes);
     }
     catch (RuntimeException e) {
       DecompilerContext.getLogger().writeMessage("Invalid signature: " + original, IFernflowerLogger.Severity.WARN);
@@ -110,7 +95,7 @@ public class GenericMain {
     }
   }
 
-  private static String parseFormalParameters(String signature, List<String> parameters, List<List<GenericType>> bounds) {
+  private static String parseFormalParameters(String signature, List<? super String> parameters, List<? super List<GenericType>> bounds) {
     if (signature.charAt(0) != '<') {
       return signature;
     }
@@ -143,7 +128,7 @@ public class GenericMain {
       String param = value.substring(0, to);
       value = value.substring(to + 1);
 
-      List<GenericType> lstBounds = new ArrayList<GenericType>();
+      List<GenericType> lstBounds = new ArrayList<>();
 
       while (true) {
         if (value.charAt(0) == ':') {
@@ -172,12 +157,9 @@ public class GenericMain {
   }
 
   public static String getGenericCastTypeName(GenericType type) {
-    String s = getTypeName(type);
-    int dim = type.arrayDim;
-    while (dim-- > 0) {
-      s += "[]";
-    }
-    return s;
+    StringBuilder s = new StringBuilder(getTypeName(type));
+    TextUtil.append(s, "[]", type.arrayDim);
+    return s.toString();
   }
 
   private static String getTypeName(GenericType type) {
@@ -193,57 +175,68 @@ public class GenericMain {
     }
     else if (tp == CodeConstants.TYPE_OBJECT) {
       StringBuilder buffer = new StringBuilder();
-      buffer.append(DecompilerContext.getImportCollector().getShortName(buildJavaClassName(type)));
-
-      if (!type.getArguments().isEmpty()) {
-        buffer.append("<");
-        for (int i = 0; i < type.getArguments().size(); i++) {
-          if (i > 0) {
-            buffer.append(", ");
-          }
-          int wildcard = type.getWildcards().get(i);
-          if (wildcard != GenericType.WILDCARD_NO) {
-            buffer.append("?");
-
-            switch (wildcard) {
-              case GenericType.WILDCARD_EXTENDS:
-                buffer.append(" extends ");
-                break;
-              case GenericType.WILDCARD_SUPER:
-                buffer.append(" super ");
-            }
-          }
-
-          GenericType genPar = type.getArguments().get(i);
-          if (genPar != null) {
-            buffer.append(getGenericCastTypeName(genPar));
-          }
-        }
-        buffer.append(">");
-      }
-
+      appendClassName(type, buffer);
       return buffer.toString();
     }
 
     throw new RuntimeException("Invalid type: " + type);
   }
 
-  private static String buildJavaClassName(GenericType type) {
-    String name = "";
-    for (GenericType tp : type.getEnclosingClasses()) {
-      name += tp.value + "$";
+  private static void appendClassName(GenericType type, StringBuilder buffer) {
+    List<GenericType> enclosingClasses = type.getEnclosingClasses();
+
+    if (enclosingClasses.isEmpty()) {
+      String name = type.value.replace('/', '.');
+      buffer.append(DecompilerContext.getImportCollector().getShortName(name));
     }
-    name += type.value;
+    else {
+      for (GenericType tp : enclosingClasses) {
+        if (buffer.length() == 0) {
+          buffer.append(DecompilerContext.getImportCollector().getShortName(tp.value.replace('/', '.')));
+        }
+        else {
+          buffer.append(tp.value);
+        }
 
-    String res = name.replace('/', '.');
-
-    if (res.contains("$")) {
-      StructClass cl = DecompilerContext.getStructContext().getClass(name);
-      if (cl == null || !cl.isOwn()) {
-        res = res.replace('$', '.');
+        appendTypeArguments(tp, buffer);
+        buffer.append('.');
       }
+
+      buffer.append(type.value);
     }
 
-    return res;
+    appendTypeArguments(type, buffer);
+  }
+
+  private static void appendTypeArguments(GenericType type, StringBuilder buffer) {
+    if (!type.getArguments().isEmpty()) {
+      buffer.append('<');
+
+      for (int i = 0; i < type.getArguments().size(); i++) {
+        if (i > 0) {
+          buffer.append(", ");
+        }
+
+        int wildcard = type.getWildcards().get(i);
+        switch (wildcard) {
+          case GenericType.WILDCARD_UNBOUND:
+            buffer.append('?');
+            break;
+          case GenericType.WILDCARD_EXTENDS:
+            buffer.append("? extends ");
+            break;
+          case GenericType.WILDCARD_SUPER:
+            buffer.append("? super ");
+            break;
+        }
+
+        GenericType genPar = type.getArguments().get(i);
+        if (genPar != null) {
+          buffer.append(getGenericCastTypeName(genPar));
+        }
+      }
+
+      buffer.append(">");
+    }
   }
 }
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
index 7ef9399..eb80491 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
@@ -1,32 +1,29 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen.generics;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class GenericMethodDescriptor {
+  public final List<String> typeParameters;
+  public final List<List<GenericType>> typeParameterBounds;
+  public final List<GenericType> parameterTypes;
+  public final GenericType returnType;
+  public final List<GenericType> exceptionTypes;
 
-  public final List<String> fparameters = new ArrayList<String>();
+  public GenericMethodDescriptor(List<String> typeParameters,
+                                 List<List<GenericType>> typeParameterBounds,
+                                 List<GenericType> parameterTypes,
+                                 GenericType returnType,
+                                 List<GenericType> exceptionTypes) {
+    this.typeParameters = substitute(typeParameters);
+    this.typeParameterBounds = substitute(typeParameterBounds);
+    this.parameterTypes = substitute(parameterTypes);
+    this.returnType = returnType;
+    this.exceptionTypes = substitute(exceptionTypes);
+  }
 
-  public final List<List<GenericType>> fbounds = new ArrayList<List<GenericType>>();
-
-  public final List<GenericType> params = new ArrayList<GenericType>();
-
-  public GenericType ret;
-
-  public final List<GenericType> exceptions = new ArrayList<GenericType>();
-}
+  private static <T> List<T> substitute(List<T> list) {
+    return list.isEmpty() ? Collections.emptyList() : list;
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
index d3b3896..60bffdb 100644
--- a/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
+++ b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.gen.generics;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
@@ -32,9 +18,9 @@ public class GenericType {
   public final int arrayDim;
   public final String value;
 
-  private final List<GenericType> enclosingClasses = new ArrayList<GenericType>();
-  private final List<GenericType> arguments = new ArrayList<GenericType>();
-  private final List<Integer> wildcards = new ArrayList<Integer>();
+  private final List<GenericType> enclosingClasses = new ArrayList<>();
+  private final List<GenericType> arguments = new ArrayList<>();
+  private final List<Integer> wildcards = new ArrayList<>();
 
   public GenericType(int type, int arrayDim, String value) {
     this.type = type;
@@ -42,6 +28,13 @@ public class GenericType {
     this.value = value;
   }
 
+  private GenericType(GenericType other, int arrayDim) {
+    this(other.type, arrayDim, other.value);
+    enclosingClasses.addAll(other.enclosingClasses);
+    arguments.addAll(other.arguments);
+    wildcards.addAll(other.wildcards);
+  }
+
   public GenericType(String signature) {
     int type = 0;
     int arrayDim = 0;
@@ -211,7 +204,7 @@ public class GenericType {
 
   public GenericType decreaseArrayDim() {
     assert arrayDim > 0 : this;
-    return new GenericType(type, arrayDim - 1, value);
+    return new GenericType(this, arrayDim - 1);
   }
 
   public List<GenericType> getArguments() {
diff --git a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
index d75c93d..63c0f8e 100644
--- a/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
+++ b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.lazy;
 
 import org.jetbrains.java.decompiler.main.extern.IBytecodeProvider;
@@ -26,8 +12,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class LazyLoader {
-
-  private final Map<String, Link> mapClassLinks = new HashMap<String, Link>();
+  private final Map<String, Link> mapClassLinks = new HashMap<>();
   private final IBytecodeProvider provider;
 
   public LazyLoader(IBytecodeProvider provider) {
@@ -47,17 +32,13 @@ public class LazyLoader {
   }
 
   public ConstantPool loadPool(String classname) {
-    try {
-      DataInputFullStream in = getClassStream(classname);
-      if (in == null) return null;
-
-      try {
+    try (DataInputFullStream in = getClassStream(classname)) {
+      if (in != null) {
         in.discard(8);
         return new ConstantPool(in);
       }
-      finally {
-        in.close();
-      }
+
+      return null;
     }
     catch (IOException ex) {
       throw new RuntimeException(ex);
@@ -67,11 +48,8 @@ public class LazyLoader {
   public byte[] loadBytecode(StructMethod mt, int codeFullLength) {
     String className = mt.getClassStruct().qualifiedName;
 
-    try {
-      DataInputFullStream in = getClassStream(className);
-      if (in == null) return null;
-
-      try {
+    try (DataInputFullStream in = getClassStream(className)) {
+      if (in != null) {
         in.discard(8);
 
         ConstantPool pool = mt.getClassStruct().getPool();
@@ -112,23 +90,19 @@ public class LazyLoader {
           for (int j = 0; j < attrSize; j++) {
             int attrNameIndex = in.readUnsignedShort();
             String attrName = pool.getPrimitiveConstant(attrNameIndex).getString();
-            if (!StructGeneralAttribute.ATTRIBUTE_CODE.equals(attrName)) {
+            if (!StructGeneralAttribute.ATTRIBUTE_CODE.getName().equals(attrName)) {
               in.discard(in.readInt());
               continue;
             }
 
             in.discard(12);
-            byte[] code = new byte[codeFullLength];
-            in.readFull(code);
-            return code;
+
+            return in.read(codeFullLength);
           }
 
           break;
         }
       }
-      finally {
-        in.close();
-      }
 
       return null;
     }
@@ -155,19 +129,13 @@ public class LazyLoader {
     }
   }
 
-
   public static class Link {
-    public static final int CLASS = 1;
-    public static final int ENTRY = 2;
-
-    public final int type;
     public final String externalPath;
     public final String internalPath;
 
-    public Link(int type, String externalPath, String internalPath) {
-      this.type = type;
+    public Link(String externalPath, String internalPath) {
       this.externalPath = externalPath;
       this.internalPath = internalPath;
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/match/IMatchable.java b/src/org/jetbrains/java/decompiler/struct/match/IMatchable.java
index 95f149e..7cc7cf9 100644
--- a/src/org/jetbrains/java/decompiler/struct/match/IMatchable.java
+++ b/src/org/jetbrains/java/decompiler/struct/match/IMatchable.java
@@ -1,23 +1,7 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.match;
 
-
 public interface IMatchable {
-
   enum MatchProperties {
     STATEMENT_TYPE,
     STATEMENT_RET,
@@ -25,7 +9,7 @@ public interface IMatchable {
     STATEMENT_EXPRSIZE,
     STATEMENT_POSITION,
     STATEMENT_IFTYPE,
-    
+
     EXPRENT_TYPE,
     EXPRENT_RET,
     EXPRENT_POSITION,
@@ -39,9 +23,8 @@ public interface IMatchable {
     EXPRENT_VAR_INDEX,
     EXPRENT_FIELD_NAME,
   }
-  
+
   IMatchable findObject(MatchNode matchNode, int index);
 
   boolean match(MatchNode matchNode, MatchEngine engine);
-  
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java b/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java
index bdef810..0eebccf 100644
--- a/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java
+++ b/src/org/jetbrains/java/decompiler/struct/match/MatchEngine.java
@@ -1,27 +1,6 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.match;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
 import org.jetbrains.java.decompiler.modules.decompiler.exps.ExitExprent;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent;
 import org.jetbrains.java.decompiler.modules.decompiler.exps.FunctionExprent;
@@ -31,22 +10,18 @@ import org.jetbrains.java.decompiler.struct.gen.VarType;
 import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
 import org.jetbrains.java.decompiler.struct.match.MatchNode.RuleValue;
 
+import java.util.*;
 
 public class MatchEngine {
+  private static final Map<String, MatchProperties> stat_properties = new HashMap<>();
+  private static final Map<String, MatchProperties> expr_properties = new HashMap<>();
+  private static final Map<String, Integer> stat_type = new HashMap<>();
+  private static final Map<String, Integer> expr_type = new HashMap<>();
+  private static final Map<String, Integer> expr_func_type = new HashMap<>();
+  private static final Map<String, Integer> expr_exit_type = new HashMap<>();
+  private static final Map<String, Integer> stat_if_type = new HashMap<>();
+  private static final Map<String, VarType> expr_const_type = new HashMap<>();
 
-  private MatchNode rootNode = null;
-  
-  private final Map<String, Object> variables = new HashMap<String, Object>();
-  
-  private static final Map<String, MatchProperties> stat_properties = new HashMap<String, MatchProperties>();
-  private static final Map<String, MatchProperties> expr_properties = new HashMap<String, MatchProperties>();
-  private static final Map<String, Integer> stat_type = new HashMap<String, Integer>();
-  private static final Map<String, Integer> expr_type = new HashMap<String, Integer>();
-  private static final Map<String, Integer> expr_func_type = new HashMap<String, Integer>();
-  private static final Map<String, Integer> expr_exit_type = new HashMap<String, Integer>();
-  private static final Map<String, Integer> stat_if_type = new HashMap<String, Integer>();
-  private static final Map<String, VarType> expr_const_type = new HashMap<String, VarType>();
-  
   static {
     stat_properties.put("type", MatchProperties.STATEMENT_TYPE);
     stat_properties.put("ret", MatchProperties.STATEMENT_RET);
@@ -54,7 +29,7 @@ public class MatchEngine {
     stat_properties.put("statsize", MatchProperties.STATEMENT_STATSIZE);
     stat_properties.put("exprsize", MatchProperties.STATEMENT_EXPRSIZE);
     stat_properties.put("iftype", MatchProperties.STATEMENT_IFTYPE);
-    
+
     expr_properties.put("type", MatchProperties.EXPRENT_TYPE);
     expr_properties.put("ret", MatchProperties.EXPRENT_RET);
     expr_properties.put("position", MatchProperties.EXPRENT_POSITION);
@@ -67,14 +42,14 @@ public class MatchEngine {
     expr_properties.put("parameter", MatchProperties.EXPRENT_INVOCATION_PARAMETER);
     expr_properties.put("index", MatchProperties.EXPRENT_VAR_INDEX);
     expr_properties.put("name", MatchProperties.EXPRENT_FIELD_NAME);
-    
+
     stat_type.put("if", Statement.TYPE_IF);
     stat_type.put("do", Statement.TYPE_DO);
     stat_type.put("switch", Statement.TYPE_SWITCH);
     stat_type.put("trycatch", Statement.TYPE_TRYCATCH);
     stat_type.put("basicblock", Statement.TYPE_BASICBLOCK);
     stat_type.put("sequence", Statement.TYPE_SEQUENCE);
-    
+
     expr_type.put("array", Exprent.EXPRENT_ARRAY);
     expr_type.put("assignment", Exprent.EXPRENT_ASSIGNMENT);
     expr_type.put("constant", Exprent.EXPRENT_CONST);
@@ -89,9 +64,9 @@ public class MatchEngine {
     expr_type.put("var", Exprent.EXPRENT_VAR);
     expr_type.put("annotation", Exprent.EXPRENT_ANNOTATION);
     expr_type.put("assert", Exprent.EXPRENT_ASSERT);
-    
+
     expr_func_type.put("eq", FunctionExprent.FUNCTION_EQ);
-    
+
     expr_exit_type.put("return", ExitExprent.EXIT_RETURN);
     expr_exit_type.put("throw", ExitExprent.EXIT_THROW);
 
@@ -101,154 +76,151 @@ public class MatchEngine {
     expr_const_type.put("null", VarType.VARTYPE_NULL);
     expr_const_type.put("string", VarType.VARTYPE_STRING);
   }
-  
 
-  public void parse(String description) {
-    
-    // each line is a separate statement/exprent 
+  private final MatchNode rootNode;
+  private final Map<String, Object> variables = new HashMap<>();
+
+  public MatchEngine(String description) {
+    // each line is a separate statement/exprent
     String[] lines = description.split("\n");
 
-    int depth = 0; 
-    LinkedList<MatchNode> stack = new LinkedList<MatchNode>(); 
-    
-    for(String line : lines) {
-      
-      List<String> properties = new ArrayList<String>(Arrays.asList(line.split("\\s+"))); // split on any number of whitespaces
-      if(properties.get(0).isEmpty()) {
+    int depth = 0;
+    LinkedList<MatchNode> stack = new LinkedList<>();
+
+    for (String line : lines) {
+      List<String> properties = new ArrayList<>(Arrays.asList(line.split("\\s+"))); // split on any number of whitespaces
+      if (properties.get(0).isEmpty()) {
         properties.remove(0);
       }
-      
+
       int node_type = "statement".equals(properties.get(0)) ? MatchNode.MATCHNODE_STATEMENT : MatchNode.MATCHNODE_EXPRENT;
-      
+
       // create new node
       MatchNode matchNode = new MatchNode(node_type);
-      for(int i = 1; i < properties.size(); ++i) {
+      for (int i = 1; i < properties.size(); ++i) {
         String[] values = properties.get(i).split(":");
-        
+
         MatchProperties property = (node_type == MatchNode.MATCHNODE_STATEMENT ? stat_properties : expr_properties).get(values[0]);
-        if(property == null) { // unknown property defined
+        if (property == null) { // unknown property defined
           throw new RuntimeException("Unknown matching property");
-        } else {
-          
-          Object value = null;
+        }
+        else {
+          Object value;
           int parameter = 0;
-          
+
           String strValue = values[1];
-          if(values.length == 3) {
+          if (values.length == 3) {
             parameter = Integer.parseInt(values[1]);
             strValue = values[2];
           }
-          
-          switch(property) {
-          case STATEMENT_TYPE:
-            value = stat_type.get(strValue);
-            break;
-          case STATEMENT_STATSIZE:
-          case STATEMENT_EXPRSIZE:
-            value = Integer.valueOf(strValue);
-            break;
-          case STATEMENT_POSITION:
-          case EXPRENT_POSITION:
-          case EXPRENT_INVOCATION_CLASS:
-          case EXPRENT_INVOCATION_SIGNATURE:
-          case EXPRENT_INVOCATION_PARAMETER:
-          case EXPRENT_VAR_INDEX:
-          case EXPRENT_FIELD_NAME:
-          case EXPRENT_CONSTVALUE:
-          case STATEMENT_RET:
-          case EXPRENT_RET:
-            value = strValue;
-            break;
-          case STATEMENT_IFTYPE:
-            value = stat_if_type.get(strValue);
-            break;
-          case EXPRENT_FUNCTYPE:
-            value = expr_func_type.get(strValue);
-            break;
-          case EXPRENT_EXITTYPE:
-            value = expr_exit_type.get(strValue);
-            break;
-          case EXPRENT_CONSTTYPE:
-            value = expr_const_type.get(strValue);
-            break;
-          case EXPRENT_TYPE:
-            value = expr_type.get(strValue);
-            break;
-          default:
-            throw new RuntimeException("Unhandled matching property");
+
+          switch (property) {
+            case STATEMENT_TYPE:
+              value = stat_type.get(strValue);
+              break;
+            case STATEMENT_STATSIZE:
+            case STATEMENT_EXPRSIZE:
+              value = Integer.valueOf(strValue);
+              break;
+            case STATEMENT_POSITION:
+            case EXPRENT_POSITION:
+            case EXPRENT_INVOCATION_CLASS:
+            case EXPRENT_INVOCATION_SIGNATURE:
+            case EXPRENT_INVOCATION_PARAMETER:
+            case EXPRENT_VAR_INDEX:
+            case EXPRENT_FIELD_NAME:
+            case EXPRENT_CONSTVALUE:
+            case STATEMENT_RET:
+            case EXPRENT_RET:
+              value = strValue;
+              break;
+            case STATEMENT_IFTYPE:
+              value = stat_if_type.get(strValue);
+              break;
+            case EXPRENT_FUNCTYPE:
+              value = expr_func_type.get(strValue);
+              break;
+            case EXPRENT_EXITTYPE:
+              value = expr_exit_type.get(strValue);
+              break;
+            case EXPRENT_CONSTTYPE:
+              value = expr_const_type.get(strValue);
+              break;
+            case EXPRENT_TYPE:
+              value = expr_type.get(strValue);
+              break;
+            default:
+              throw new RuntimeException("Unhandled matching property");
           }
 
           matchNode.addRule(property, new RuleValue(parameter, value));
         }
       }
-      
-      if(stack.isEmpty()) { // first line, root node
+
+      if (stack.isEmpty()) { // first line, root node
         stack.push(matchNode);
-      } else {
-      
-        // return to the correct parent on the stack  
+      }
+      else {
+        // return to the correct parent on the stack
         int new_depth = line.lastIndexOf(' ', depth) + 1;
-        for(int i = new_depth; i <= depth; ++i) {
+        for (int i = new_depth; i <= depth; ++i) {
           stack.pop();
         }
-  
+
         // insert new node
         stack.getFirst().addChild(matchNode);
         stack.push(matchNode);
-        
-        depth = new_depth; 
+
+        depth = new_depth;
       }
     }
-    
+
     this.rootNode = stack.getLast();
   }
-  
+
   public boolean match(IMatchable object) {
     variables.clear();
     return match(this.rootNode, object);
   }
-  
+
   private boolean match(MatchNode matchNode, IMatchable object) {
-    
-    if(!object.match(matchNode, this)) { 
+    if (!object.match(matchNode, this)) {
       return false;
     }
-    
+
     int expr_index = 0;
     int stat_index = 0;
-
-    for(MatchNode childNode : matchNode.getChildren()) {
+    for (MatchNode childNode : matchNode.getChildren()) {
       boolean isStatement = childNode.getType() == MatchNode.MATCHNODE_STATEMENT;
-      
+
       IMatchable childObject = object.findObject(childNode, isStatement ? stat_index : expr_index);
-      if(childObject == null || !match(childNode, childObject)) {
+      if (childObject == null || !match(childNode, childObject)) {
         return false;
       }
-      
-      if(isStatement) {
+
+      if (isStatement) {
         stat_index++;
-      } else {
+      }
+      else {
         expr_index++;
       }
     }
-    
+
     return true;
   }
 
   public boolean checkAndSetVariableValue(String name, Object value) {
-    
     Object old_value = variables.get(name);
-    if(old_value == null) {
-      variables.put(name, value);
-    } else if(!old_value.equals(value)) {
-      return false;
+    if (old_value != null) {
+      return old_value.equals(value);
+    }
+    else {
+      variables.put(name, value);
+      return true;
     }
-    
-    return true;
   }
-  
+
   public Object getVariableValue(String name) {
     return variables.get(name);
   }
-  
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/struct/match/MatchNode.java b/src/org/jetbrains/java/decompiler/struct/match/MatchNode.java
index f922a3c..ff33e75 100644
--- a/src/org/jetbrains/java/decompiler/struct/match/MatchNode.java
+++ b/src/org/jetbrains/java/decompiler/struct/match/MatchNode.java
@@ -1,58 +1,40 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.struct.match;
 
+import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.jetbrains.java.decompiler.struct.match.IMatchable.MatchProperties;
-
 public class MatchNode {
-
   public static class RuleValue {
     public final int parameter;
     public final Object value;
-    
+
     public RuleValue(int parameter, Object value) {
       this.parameter = parameter;
       this.value = value;
     }
-    
+
     public boolean isVariable() {
       String strValue = value.toString();
       return (strValue.charAt(0) == '$' && strValue.charAt(strValue.length() - 1) == '$');
     }
-    
+
     public String toString() {
       return value.toString();
     }
   }
-  
+
   public static final int MATCHNODE_STATEMENT = 0;
   public static final int MATCHNODE_EXPRENT = 1;
-  
+
   private final int type;
-  
-  private final Map<MatchProperties, RuleValue> rules = new HashMap<MatchProperties, RuleValue>();
-  
-  private final List<MatchNode> children = new ArrayList<MatchNode>();
-  
-  
+  private final Map<MatchProperties, RuleValue> rules = new HashMap<>();
+  private final List<MatchNode> children = new ArrayList<>();
+
   public MatchNode(int type) {
     this.type = type;
   }
@@ -60,7 +42,7 @@ public class MatchNode {
   public void addChild(MatchNode child) {
     children.add(child);
   }
-  
+
   public void addRule(MatchProperties property, RuleValue value) {
     rules.put(property, value);
   }
@@ -76,10 +58,9 @@ public class MatchNode {
   public Map<MatchProperties, RuleValue> getRules() {
     return rules;
   }
-  
+
   public Object getRuleValue(MatchProperties property) {
     RuleValue rule = rules.get(property);
     return rule == null ? null : rule.value;
   }
-  
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/util/DataInputFullStream.java b/src/org/jetbrains/java/decompiler/util/DataInputFullStream.java
index 011edde..286f315 100644
--- a/src/org/jetbrains/java/decompiler/util/DataInputFullStream.java
+++ b/src/org/jetbrains/java/decompiler/util/DataInputFullStream.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import java.io.ByteArrayInputStream;
@@ -20,36 +6,15 @@ import java.io.DataInputStream;
 import java.io.IOException;
 
 public class DataInputFullStream extends DataInputStream {
-
   public DataInputFullStream(byte[] bytes) {
     super(new ByteArrayInputStream(bytes));
   }
 
-  public int readFull(byte[] b) throws IOException {
-    int length = b.length;
-    byte[] temp = new byte[length];
-    int pos = 0;
-
-    int bytes_read;
-    while (true) {
-      bytes_read = read(temp, 0, length - pos);
-      if (bytes_read == -1) {
-        return -1;
-      }
-
-      System.arraycopy(temp, 0, b, pos, bytes_read);
-      pos += bytes_read;
-      if (pos == length) {
-        break;
-      }
-    }
-
-    return length;
+  public byte[] read(int n) throws IOException {
+    return InterpreterUtil.readBytes(this, n);
   }
 
   public void discard(int n) throws IOException {
-    if (super.skip(n) != n) {
-      throw new IOException("Skip failed");
-    }
+    InterpreterUtil.discardBytes(this, n);
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
index 09ce36b..d05b7d4 100644
--- a/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
+++ b/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
@@ -1,25 +1,14 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 public class FastFixedSetFactory<E> {
 
-  private final VBStyleCollection<int[], E> colValuesInternal = new VBStyleCollection<int[], E>();
+  private final VBStyleCollection<int[], E> colValuesInternal = new VBStyleCollection<>();
 
   private final int dataLength;
 
@@ -46,7 +35,7 @@ public class FastFixedSetFactory<E> {
   }
 
   public FastFixedSet<E> spawnEmptySet() {
-    return new FastFixedSet<E>(this);
+    return new FastFixedSet<>(this);
   }
 
   private int getDataLength() {
@@ -74,7 +63,7 @@ public class FastFixedSetFactory<E> {
 
     public FastFixedSet<E> getCopy() {
 
-      FastFixedSet<E> copy = new FastFixedSet<E>(factory);
+      FastFixedSet<E> copy = new FastFixedSet<>(factory);
 
       int arrlength = data.length;
       int[] cpdata = new int[arrlength];
@@ -111,12 +100,6 @@ public class FastFixedSetFactory<E> {
       data[index[0]] &= ~index[1];
     }
 
-    public void removeAll(Collection<E> set) {
-      for (E element : set) {
-        remove(element);
-      }
-    }
-
     public boolean contains(E element) {
       int[] index = colValuesInternal.getWithKey(element);
       return (data[index[0]] & index[1]) != 0;
@@ -153,15 +136,6 @@ public class FastFixedSetFactory<E> {
       }
     }
 
-    public void symdiff(FastFixedSet<E> set) {
-      int[] extdata = set.getData();
-      int[] intdata = data;
-
-      for (int i = intdata.length - 1; i >= 0; i--) {
-        intdata[i] ^= extdata[i];
-      }
-    }
-
     public void complement(FastFixedSet<E> set) {
       int[] extdata = set.getData();
       int[] intdata = data;
@@ -174,7 +148,7 @@ public class FastFixedSetFactory<E> {
 
     public boolean equals(Object o) {
       if (o == this) return true;
-      if (o == null || !(o instanceof FastFixedSet)) return false;
+      if (!(o instanceof FastFixedSet)) return false;
 
       int[] extdata = ((FastFixedSet)o).getData();
       int[] intdata = data;
@@ -200,19 +174,15 @@ public class FastFixedSetFactory<E> {
       return true;
     }
 
+    @Override
     public Iterator<E> iterator() {
-      return new FastFixedSetIterator<E>(this);
+      return new FastFixedSetIterator<>(this);
     }
 
     public Set<E> toPlainSet() {
-      return toPlainCollection(new HashSet<E>());
+      return toPlainCollection(new HashSet<>());
     }
 
-    public List<E> toPlainList() {
-      return toPlainCollection(new ArrayList<E>());
-    }
-
-
     private <T extends Collection<E>> T toPlainCollection(T cl) {
 
       int[] intdata = data;
@@ -233,18 +203,6 @@ public class FastFixedSetFactory<E> {
       return cl;
     }
 
-    public String toBinary() {
-
-      StringBuilder buffer = new StringBuilder();
-      int[] intdata = data;
-
-      for (int i = 0; i < intdata.length; i++) {
-        buffer.append(" ").append(Integer.toBinaryString(intdata[i]));
-      }
-
-      return buffer.toString();
-    }
-
     public String toString() {
 
       StringBuilder buffer = new StringBuilder("{");
@@ -331,11 +289,13 @@ public class FastFixedSetFactory<E> {
       return -1;
     }
 
+    @Override
     public boolean hasNext() {
       next_pointer = getNextIndex(pointer);
       return (next_pointer >= 0);
     }
 
+    @Override
     public E next() {
       if (next_pointer >= 0) {
         pointer = next_pointer;
@@ -351,10 +311,10 @@ public class FastFixedSetFactory<E> {
       return pointer < size ? colValuesInternal.getKey(pointer) : null;
     }
 
+    @Override
     public void remove() {
       int[] index = colValuesInternal.get(pointer);
       data[index[0]] &= ~index[1];
     }
   }
-}
-
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/util/FastSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastSetFactory.java
deleted file mode 100644
index ab80150..0000000
--- a/src/org/jetbrains/java/decompiler/util/FastSetFactory.java
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler.util;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-public class FastSetFactory<E> {
-
-  private final VBStyleCollection<int[], E> colValuesInternal = new VBStyleCollection<int[], E>();
-
-  private int lastBlock;
-
-  private int lastMask;
-
-  public FastSetFactory(Collection<E> set) {
-
-    int block = -1;
-    int mask = -1;
-    int index = 0;
-
-    for (E element : set) {
-
-      block = index / 32;
-
-      if (index % 32 == 0) {
-        mask = 1;
-      }
-      else {
-        mask <<= 1;
-      }
-
-      colValuesInternal.putWithKey(new int[]{block, mask}, element);
-
-      index++;
-    }
-
-    lastBlock = block;
-    lastMask = mask;
-  }
-
-  private int[] addElement(E element) {
-
-    if (lastMask == -1 || lastMask == 0x80000000) {
-      lastMask = 1;
-      lastBlock++;
-    }
-    else {
-      lastMask <<= 1;
-    }
-
-    int[] pointer = new int[]{lastBlock, lastMask};
-    colValuesInternal.putWithKey(pointer, element);
-
-    return pointer;
-  }
-
-  public FastSet<E> spawnEmptySet() {
-    return new FastSet<E>(this);
-  }
-
-  public int getLastBlock() {
-    return lastBlock;
-  }
-
-  public int getLastMask() {
-    return lastMask;
-  }
-
-  private VBStyleCollection<int[], E> getInternalValuesCollection() {
-    return colValuesInternal;
-  }
-
-
-  public static class FastSet<E> implements Iterable<E> {
-
-    private final FastSetFactory<E> factory;
-
-    private final VBStyleCollection<int[], E> colValuesInternal;
-
-    private int[] data;
-
-    private FastSet(FastSetFactory<E> factory) {
-      this.factory = factory;
-      this.colValuesInternal = factory.getInternalValuesCollection();
-      this.data = new int[factory.getLastBlock() + 1];
-    }
-
-    public FastSet<E> getCopy() {
-
-      FastSet<E> copy = new FastSet<E>(factory);
-
-      int arrlength = data.length;
-      int[] cpdata = new int[arrlength];
-
-      System.arraycopy(data, 0, cpdata, 0, arrlength);
-      copy.setData(cpdata);
-
-      return copy;
-    }
-
-    private int[] ensureCapacity(int index) {
-
-      int newlength = data.length;
-      if (newlength == 0) {
-        newlength = 1;
-      }
-
-      while (newlength <= index) {
-        newlength *= 2;
-      }
-
-      int[] newdata = new int[newlength];
-      System.arraycopy(data, 0, newdata, 0, data.length);
-
-      return data = newdata;
-    }
-
-    public void add(E element) {
-      int[] index = colValuesInternal.getWithKey(element);
-
-      if (index == null) {
-        index = factory.addElement(element);
-      }
-
-      if (index[0] >= data.length) {
-        ensureCapacity(index[0]);
-      }
-
-      data[index[0]] |= index[1];
-    }
-
-    public void setAllElements() {
-
-      int lastblock = factory.getLastBlock();
-      int lastmask = factory.getLastMask();
-
-      if (lastblock >= data.length) {
-        ensureCapacity(lastblock);
-      }
-
-      for (int i = lastblock - 1; i >= 0; i--) {
-        data[i] = 0xFFFFFFFF;
-      }
-
-      data[lastblock] = lastmask | (lastmask - 1);
-    }
-
-    public void addAll(Set<E> set) {
-      for (E element : set) {
-        add(element);
-      }
-    }
-
-    public void remove(E element) {
-      int[] index = colValuesInternal.getWithKey(element);
-
-      if (index == null) {
-        index = factory.addElement(element);
-      }
-
-      if (index[0] < data.length) {
-        data[index[0]] &= ~index[1];
-      }
-    }
-
-    public void removeAll(Set<E> set) {
-      for (E element : set) {
-        remove(element);
-      }
-    }
-
-    public boolean contains(E element) {
-      int[] index = colValuesInternal.getWithKey(element);
-
-      if (index == null) {
-        index = factory.addElement(element);
-      }
-
-      return index[0] < data.length && ((data[index[0]] & index[1]) != 0);
-    }
-
-    public boolean contains(FastSet<E> set) {
-      int[] extdata = set.getData();
-      int[] intdata = data;
-
-      int minlength = Math.min(extdata.length, intdata.length);
-
-      for (int i = minlength - 1; i >= 0; i--) {
-        if ((extdata[i] & ~intdata[i]) != 0) {
-          return false;
-        }
-      }
-
-      for (int i = extdata.length - 1; i >= minlength; i--) {
-        if (extdata[i] != 0) {
-          return false;
-        }
-      }
-
-      return true;
-    }
-
-    public void union(FastSet<E> set) {
-
-      int[] extdata = set.getData();
-      int[] intdata = data;
-
-      int minlength = Math.min(extdata.length, intdata.length);
-
-      for (int i = minlength - 1; i >= 0; i--) {
-        intdata[i] |= extdata[i];
-      }
-
-      boolean expanded = false;
-      for (int i = extdata.length - 1; i >= minlength; i--) {
-        if (extdata[i] != 0) {
-          if (!expanded) {
-            intdata = ensureCapacity(extdata.length - 1);
-          }
-          intdata[i] = extdata[i];
-        }
-      }
-    }
-
-    public void intersection(FastSet<E> set) {
-      int[] extdata = set.getData();
-      int[] intdata = data;
-
-      int minlength = Math.min(extdata.length, intdata.length);
-
-      for (int i = minlength - 1; i >= 0; i--) {
-        intdata[i] &= extdata[i];
-      }
-
-      for (int i = intdata.length - 1; i >= minlength; i--) {
-        intdata[i] = 0;
-      }
-    }
-
-    public void symdiff(FastSet<E> set) {
-      int[] extdata = set.getData();
-      int[] intdata = data;
-
-      int minlength = Math.min(extdata.length, intdata.length);
-
-      for (int i = minlength - 1; i >= 0; i--) {
-        intdata[i] ^= extdata[i];
-      }
-
-      boolean expanded = false;
-      for (int i = extdata.length - 1; i >= minlength; i--) {
-        if (extdata[i] != 0) {
-          if (!expanded) {
-            intdata = ensureCapacity(extdata.length - 1);
-          }
-          intdata[i] = extdata[i];
-        }
-      }
-    }
-
-    public void complement(FastSet<E> set) {
-      int[] extdata = set.getData();
-      int[] intdata = data;
-
-      int minlength = Math.min(extdata.length, intdata.length);
-
-      for (int i = minlength - 1; i >= 0; i--) {
-        intdata[i] &= ~extdata[i];
-      }
-    }
-
-
-    public boolean equals(Object o) {
-      if (o == this) return true;
-      if (o == null || !(o instanceof FastSet)) return false;
-
-      int[] longdata = ((FastSet)o).getData();
-      int[] shortdata = data;
-
-      if (data.length > longdata.length) {
-        shortdata = longdata;
-        longdata = data;
-      }
-
-      for (int i = shortdata.length - 1; i >= 0; i--) {
-        if (shortdata[i] != longdata[i]) {
-          return false;
-        }
-      }
-
-      for (int i = longdata.length - 1; i >= shortdata.length; i--) {
-        if (longdata[i] != 0) {
-          return false;
-        }
-      }
-
-      return true;
-    }
-
-    public int getCardinality() {
-
-      boolean found = false;
-      int[] intdata = data;
-
-      for (int i = intdata.length - 1; i >= 0; i--) {
-        int block = intdata[i];
-        if (block != 0) {
-          if (found) {
-            return 2;
-          }
-          else {
-            if ((block & (block - 1)) == 0) {
-              found = true;
-            }
-            else {
-              return 2;
-            }
-          }
-        }
-      }
-
-      return found ? 1 : 0;
-    }
-
-    public int size() {
-
-      int size = 0;
-      int[] intdata = data;
-
-      for (int i = intdata.length - 1; i >= 0; i--) {
-        size += Integer.bitCount(intdata[i]);
-      }
-
-      return size;
-    }
-
-    public boolean isEmpty() {
-      int[] intdata = data;
-
-      for (int i = intdata.length - 1; i >= 0; i--) {
-        if (intdata[i] != 0) {
-          return false;
-        }
-      }
-
-      return true;
-    }
-
-    public Iterator<E> iterator() {
-      return new FastSetIterator<E>(this);
-    }
-
-    public Set<E> toPlainSet() {
-      HashSet<E> set = new HashSet<E>();
-
-      int[] intdata = data;
-
-      int size = data.length * 32;
-      if (size > colValuesInternal.size()) {
-        size = colValuesInternal.size();
-      }
-
-      for (int i = size - 1; i >= 0; i--) {
-        int[] index = colValuesInternal.get(i);
-
-        if ((intdata[index[0]] & index[1]) != 0) {
-          set.add(colValuesInternal.getKey(i));
-        }
-      }
-
-      return set;
-    }
-
-    public String toBinary() {
-
-      StringBuilder buffer = new StringBuilder();
-      int[] intdata = data;
-
-      for (int i = 0; i < intdata.length; i++) {
-        buffer.append(" ").append(Integer.toBinaryString(intdata[i]));
-      }
-
-      return buffer.toString();
-    }
-
-    private int[] getData() {
-      return data;
-    }
-
-    private void setData(int[] data) {
-      this.data = data;
-    }
-
-    public int[] getLoad() {
-      int[] intdata = data;
-      int notempty = 0;
-
-      for (int i = 0; i < intdata.length; i++) {
-        if (intdata[i] != 0) {
-          notempty++;
-        }
-      }
-
-      return new int[]{intdata.length, notempty};
-    }
-
-    public FastSetFactory<E> getFactory() {
-      return factory;
-    }
-  }
-
-  public static class FastSetIterator<E> implements Iterator<E> {
-
-    private final VBStyleCollection<int[], E> colValuesInternal;
-    private final int[] data;
-    private int size;
-
-    private int pointer = -1;
-    private int next_pointer = -1;
-
-    private FastSetIterator(FastSet<E> set) {
-      colValuesInternal = set.getFactory().getInternalValuesCollection();
-      data = set.getData();
-
-      size = colValuesInternal.size();
-      int datasize = data.length * 32;
-
-      if (datasize < size) {
-        size = datasize;
-      }
-    }
-
-    public boolean hasNext() {
-
-      next_pointer = pointer;
-
-      while (++next_pointer < size) {
-        int[] index = colValuesInternal.get(next_pointer);
-        if ((data[index[0]] & index[1]) != 0) {
-          return true;
-        }
-      }
-
-      next_pointer = -1;
-      return false;
-    }
-
-    public E next() {
-      if (next_pointer >= 0) {
-        pointer = next_pointer;
-      }
-      else {
-        while (++pointer < size) {
-          int[] index = colValuesInternal.get(pointer);
-          if ((data[index[0]] & index[1]) != 0) {
-            break;
-          }
-        }
-      }
-
-      next_pointer = -1;
-      return pointer < size ? colValuesInternal.getKey(pointer) : null;
-    }
-
-    public void remove() {
-      int[] index = colValuesInternal.get(pointer);
-      data[index[0]] &= ~index[1];
-
-      pointer--;
-    }
-  }
-}
-
diff --git a/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
index a4ad9ac..b955139 100644
--- a/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
+++ b/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import java.util.Collection;
@@ -22,13 +8,13 @@ import java.util.Set;
 
 public class FastSparseSetFactory<E> {
 
-  private final VBStyleCollection<int[], E> colValuesInternal = new VBStyleCollection<int[], E>();
+  private final VBStyleCollection<int[], E> colValuesInternal = new VBStyleCollection<>();
 
   private int lastBlock;
 
   private int lastMask;
 
-  public FastSparseSetFactory(Collection<E> set) {
+  public FastSparseSetFactory(Collection<? extends E> set) {
 
     int block = -1;
     int mask = -1;
@@ -71,17 +57,13 @@ public class FastSparseSetFactory<E> {
   }
 
   public FastSparseSet<E> spawnEmptySet() {
-    return new FastSparseSet<E>(this);
+    return new FastSparseSet<>(this);
   }
 
   public int getLastBlock() {
     return lastBlock;
   }
 
-  public int getLastMask() {
-    return lastMask;
-  }
-
   private VBStyleCollection<int[], E> getInternalValuesCollection() {
     return colValuesInternal;
   }
@@ -123,7 +105,7 @@ public class FastSparseSetFactory<E> {
       System.arraycopy(data, 0, cpdata, 0, arrlength);
       System.arraycopy(next, 0, cpnext, 0, arrlength);
 
-      return new FastSparseSet<E>(factory, cpdata, cpnext);
+      return new FastSparseSet<>(factory, cpdata, cpnext);
     }
 
     private int[] ensureCapacity(int index) {
@@ -165,30 +147,6 @@ public class FastSparseSetFactory<E> {
       changeNext(next, block, next[block], block);
     }
 
-    public void setAllElements() {
-
-      int lastblock = factory.getLastBlock();
-      int lastmask = factory.getLastMask();
-
-      if (lastblock >= data.length) {
-        ensureCapacity(lastblock);
-      }
-
-      for (int i = lastblock - 1; i >= 0; i--) {
-        data[i] = 0xFFFFFFFF;
-        next[i] = i + 1;
-      }
-
-      data[lastblock] = lastmask | (lastmask - 1);
-      next[lastblock] = 0;
-    }
-
-    public void addAll(Set<E> set) {
-      for (E element : set) {
-        add(element);
-      }
-    }
-
     public void remove(E element) {
       int[] index = colValuesInternal.getWithKey(element);
 
@@ -206,12 +164,6 @@ public class FastSparseSetFactory<E> {
       }
     }
 
-    public void removeAll(Set<E> set) {
-      for (E element : set) {
-        remove(element);
-      }
-    }
-
     public boolean contains(E element) {
       int[] index = colValuesInternal.getWithKey(element);
 
@@ -222,27 +174,6 @@ public class FastSparseSetFactory<E> {
       return index[0] < data.length && ((data[index[0]] & index[1]) != 0);
     }
 
-    public boolean contains(FastSparseSet<E> set) {
-      int[] extdata = set.getData();
-      int[] intdata = data;
-
-      int minlength = Math.min(extdata.length, intdata.length);
-
-      for (int i = minlength - 1; i >= 0; i--) {
-        if ((extdata[i] & ~intdata[i]) != 0) {
-          return false;
-        }
-      }
-
-      for (int i = extdata.length - 1; i >= minlength; i--) {
-        if (extdata[i] != 0) {
-          return false;
-        }
-      }
-
-      return true;
-    }
-
     private void setNext() {
 
       int link = 0;
@@ -307,29 +238,6 @@ public class FastSparseSetFactory<E> {
       setNext();
     }
 
-    public void symdiff(FastSparseSet<E> set) {
-      int[] extdata = set.getData();
-      int[] intdata = data;
-
-      int minlength = Math.min(extdata.length, intdata.length);
-
-      for (int i = minlength - 1; i >= 0; i--) {
-        intdata[i] ^= extdata[i];
-      }
-
-      boolean expanded = false;
-      for (int i = extdata.length - 1; i >= minlength; i--) {
-        if (extdata[i] != 0) {
-          if (!expanded) {
-            intdata = ensureCapacity(extdata.length - 1);
-          }
-          intdata[i] = extdata[i];
-        }
-      }
-
-      setNext();
-    }
-
     public void complement(FastSparseSet<E> set) {
 
       int[] extdata = set.getData();
@@ -355,7 +263,7 @@ public class FastSparseSetFactory<E> {
 
     public boolean equals(Object o) {
       if (o == this) return true;
-      if (o == null || !(o instanceof FastSparseSet)) return false;
+      if (!(o instanceof FastSparseSet)) return false;
 
       int[] longdata = ((FastSparseSet)o).getData();
       int[] shortdata = data;
@@ -409,12 +317,13 @@ public class FastSparseSetFactory<E> {
       return data.length == 0 || (next[0] == 0 && data[0] == 0);
     }
 
+    @Override
     public Iterator<E> iterator() {
-      return new FastSparseSetIterator<E>(this);
+      return new FastSparseSetIterator<>(this);
     }
 
     public Set<E> toPlainSet() {
-      HashSet<E> set = new HashSet<E>();
+      HashSet<E> set = new HashSet<>();
 
       int[] intdata = data;
 
@@ -438,18 +347,6 @@ public class FastSparseSetFactory<E> {
       return toPlainSet().toString();
     }
 
-    public String toBinary() {
-
-      StringBuilder buffer = new StringBuilder();
-      int[] intdata = data;
-
-      for (int i = 0; i < intdata.length; i++) {
-        buffer.append(" ").append(Integer.toBinaryString(intdata[i]));
-      }
-
-      return buffer.toString();
-    }
-
     private int[] getData() {
       return data;
     }
@@ -458,19 +355,6 @@ public class FastSparseSetFactory<E> {
       return next;
     }
 
-    public int[] getLoad() {
-      int[] intdata = data;
-      int notempty = 0;
-
-      for (int i = 0; i < intdata.length; i++) {
-        if (intdata[i] != 0) {
-          notempty++;
-        }
-      }
-
-      return new int[]{intdata.length, notempty};
-    }
-
     public FastSparseSetFactory<E> getFactory() {
       return factory;
     }
@@ -524,11 +408,13 @@ public class FastSparseSetFactory<E> {
       return -1;
     }
 
+    @Override
     public boolean hasNext() {
       next_pointer = getNextIndex(pointer);
       return (next_pointer >= 0);
     }
 
+    @Override
     public E next() {
       if (next_pointer >= 0) {
         pointer = next_pointer;
@@ -544,6 +430,7 @@ public class FastSparseSetFactory<E> {
       return pointer < size ? colValuesInternal.getKey(pointer) : null;
     }
 
+    @Override
     public void remove() {
       int[] index = colValuesInternal.get(pointer);
       data[index[0]] &= ~index[1];
diff --git a/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java b/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
index b965009..1d29253 100644
--- a/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
+++ b/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
@@ -1,25 +1,7 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
-import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
-
 import java.io.*;
-import java.nio.channels.FileChannel;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -31,27 +13,11 @@ public class InterpreterUtil {
 
   public static final int[] EMPTY_INT_ARRAY = new int[0];
 
-  private static final int CHANNEL_WINDOW_SIZE = IS_WINDOWS ? 64 * 1024 * 1024 - (32 * 1024) : 64 * 1024 * 1024;  // magic number for Windows
   private static final int BUFFER_SIZE = 16 * 1024;
 
-  public static void copyFile(File in, File out) throws IOException {
-    FileInputStream inStream = new FileInputStream(in);
-    try {
-      FileOutputStream outStream = new FileOutputStream(out);
-      try {
-        FileChannel inChannel = inStream.getChannel();
-        FileChannel outChannel = outStream.getChannel();
-        long size = inChannel.size(), position = 0;
-        while (position < size) {
-          position += inChannel.transferTo(position, CHANNEL_WINDOW_SIZE, outChannel);
-        }
-      }
-      finally {
-        outStream.close();
-      }
-    }
-    finally {
-      inStream.close();
+  public static void copyFile(File source, File target) throws IOException {
+    try (FileInputStream in = new FileInputStream(source); FileOutputStream out = new FileOutputStream(target)) {
+      copyStream(in, out);
     }
   }
 
@@ -64,39 +30,36 @@ public class InterpreterUtil {
   }
 
   public static byte[] getBytes(ZipFile archive, ZipEntry entry) throws IOException {
-    return readAndClose(archive.getInputStream(entry), (int)entry.getSize());
+    try (InputStream stream = archive.getInputStream(entry)) {
+      return readBytes(stream, (int)entry.getSize());
+    }
   }
 
   public static byte[] getBytes(File file) throws IOException {
-    return readAndClose(new FileInputStream(file), (int)file.length());
+    try (FileInputStream stream = new FileInputStream(file)) {
+      return readBytes(stream, (int)file.length());
+    }
   }
 
-  private static byte[] readAndClose(InputStream stream, int length) throws IOException {
-    try {
-      byte[] bytes = new byte[length];
-      int n = 0, off = 0;
-      while (n < length) {
-        int count = stream.read(bytes, off + n, length - n);
-        if (count < 0) {
-          throw new IOException("premature end of stream");
-        }
-        n += count;
+  public static byte[] readBytes(InputStream stream, int length) throws IOException {
+    byte[] bytes = new byte[length];
+
+    int n = 0, off = 0;
+    while (n < length) {
+      int count = stream.read(bytes, off + n, length - n);
+      if (count < 0) {
+        throw new IOException("premature end of stream");
       }
-      return bytes;
-    }
-    finally {
-      stream.close();
+      n += count;
     }
+
+    return bytes;
   }
 
-  public static String getIndentString(int length) {
-    if (length == 0) return "";
-    StringBuilder buf = new StringBuilder();
-    String indent = (String)DecompilerContext.getProperty(IFernflowerPreferences.INDENT_STRING);
-    while (length-- > 0) {
-      buf.append(indent);
+  public static void discardBytes(InputStream stream, int length) throws IOException {
+    if (stream.skip(length) != length) {
+      throw new IOException("premature end of stream");
     }
-    return buf.toString();
   }
 
   public static boolean equalSets(Collection<?> c1, Collection<?> c2) {
@@ -111,7 +74,7 @@ public class InterpreterUtil {
       return false;
     }
 
-    HashSet<Object> set = new HashSet<Object>(c1);
+    HashSet<Object> set = new HashSet<>(c1);
     set.removeAll(c2);
     return (set.size() == 0);
   }
@@ -120,25 +83,6 @@ public class InterpreterUtil {
     return first == null ? second == null : first.equals(second);
   }
 
-  public static boolean equalObjectArrays(Object[] first, Object[] second) {
-    if (first == null || second == null) {
-      return equalObjects(first, second);
-    }
-    else {
-      if (first.length != second.length) {
-        return false;
-      }
-
-      for (int i = 0; i < first.length; i++) {
-        if (!equalObjects(first[i], second[i])) {
-          return false;
-        }
-      }
-    }
-
-    return true;
-  }
-
   public static boolean equalLists(List<?> first, List<?> second) {
     if (first == null) {
       return second == null;
@@ -159,19 +103,11 @@ public class InterpreterUtil {
     return false;
   }
 
-  public static boolean isPrintableUnicode(char c) {
-    int t = Character.getType(c);
-    return t != Character.UNASSIGNED && t != Character.LINE_SEPARATOR && t != Character.PARAGRAPH_SEPARATOR &&
-           t != Character.CONTROL && t != Character.FORMAT && t != Character.PRIVATE_USE && t != Character.SURROGATE;
-  }
-
-  public static String charToUnicodeLiteral(int value) {
-    String sTemp = Integer.toHexString(value);
-    sTemp = ("0000" + sTemp).substring(sTemp.length());
-    return "\\u" + sTemp;
-  }
-
   public static String makeUniqueKey(String name, String descriptor) {
-    return name + " " + descriptor;
+    return name + ' ' + descriptor;
   }
-}
+
+  public static String makeUniqueKey(String name, String descriptor1, String descriptor2) {
+    return name + ' ' + descriptor1 + ' ' + descriptor2;
+  }
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/util/ListStack.java b/src/org/jetbrains/java/decompiler/util/ListStack.java
index 19c2416..ac0dad9 100644
--- a/src/org/jetbrains/java/decompiler/util/ListStack.java
+++ b/src/org/jetbrains/java/decompiler/util/ListStack.java
@@ -1,44 +1,30 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import java.util.ArrayList;
 
 public class ListStack<T> extends ArrayList<T> {
-
   protected int pointer = 0;
 
   public ListStack() {
     super();
   }
 
-  public ListStack(ArrayList<T> list) {
+  public ListStack(ArrayList<? extends T> list) {
     super(list);
   }
 
+  @Override
+  @SuppressWarnings("MethodDoesntCallSuperMethod")
   public ListStack<T> clone() {
-    ListStack<T> newstack = new ListStack<T>(this);
-    newstack.pointer = this.pointer;
-    return newstack;
+    ListStack<T> copy = new ListStack<>(this);
+    copy.pointer = this.pointer;
+    return copy;
   }
 
-  public T push(T item) {
+  public void push(T item) {
     this.add(item);
     pointer++;
-    return item;
   }
 
   public T pop() {
@@ -56,11 +42,6 @@ public class ListStack<T> extends ArrayList<T> {
     return o;
   }
 
-  public void remove() {
-    pointer--;
-    this.remove(pointer);
-  }
-
   public void removeMultiple(int count) {
     while (count > 0) {
       pointer--;
@@ -69,10 +50,6 @@ public class ListStack<T> extends ArrayList<T> {
     }
   }
 
-  public boolean empty() {
-    return (pointer == 0);
-  }
-
   public int getPointer() {
     return pointer;
   }
@@ -86,8 +63,9 @@ public class ListStack<T> extends ArrayList<T> {
     pointer++;
   }
 
+  @Override
   public void clear() {
     super.clear();
     pointer = 0;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java b/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
index fd9d5c4..16a0484 100644
--- a/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
+++ b/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent;
@@ -119,10 +105,6 @@ public class SFormsFastMapDirect {
     putInternal(key, value, false);
   }
 
-  public void remove(int key) {
-    putInternal(key, null, true);
-  }
-
   public void removeAllFields() {
     FastSparseSet<Integer>[] arr = elements[2];
     int[] arrnext = next[2];
@@ -353,7 +335,7 @@ public class SFormsFastMapDirect {
   }
 
   public List<Entry<Integer, FastSparseSet<Integer>>> entryList() {
-    List<Entry<Integer, FastSparseSet<Integer>>> list = new ArrayList<Entry<Integer, FastSparseSet<Integer>>>();
+    List<Entry<Integer, FastSparseSet<Integer>>> list = new ArrayList<>();
 
     for (int i = 2; i >= 0; i--) {
       int ikey = 0;
@@ -366,14 +348,17 @@ public class SFormsFastMapDirect {
             private final Integer var = key;
             private final FastSparseSet<Integer> val = ent;
 
+            @Override
             public Integer getKey() {
               return var;
             }
 
+            @Override
             public FastSparseSet<Integer> getValue() {
               return val;
             }
 
+            @Override
             public FastSparseSet<Integer> setValue(FastSparseSet<Integer> newvalue) {
               return null;
             }
@@ -411,4 +396,4 @@ public class SFormsFastMapDirect {
 
     return arrnew;
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/main/TextBuffer.java b/src/org/jetbrains/java/decompiler/util/TextBuffer.java
similarity index 78%
rename from src/org/jetbrains/java/decompiler/main/TextBuffer.java
rename to src/org/jetbrains/java/decompiler/util/TextBuffer.java
index 95afc50..2d09c2d 100644
--- a/src/org/jetbrains/java/decompiler/main/TextBuffer.java
+++ b/src/org/jetbrains/java/decompiler/util/TextBuffer.java
@@ -1,20 +1,9 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
-package org.jetbrains.java.decompiler.main;
+package org.jetbrains.java.decompiler.util;
 
+import org.jetbrains.java.decompiler.main.DecompilerContext;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 
 import java.util.*;
@@ -24,6 +13,7 @@ import java.util.*;
  *
  * @author egor
  */
+@SuppressWarnings("UnusedReturnValue")
 public class TextBuffer {
   private final String myLineSeparator = DecompilerContext.getNewLineSeparator();
   private final String myIndent = (String)DecompilerContext.getProperty(IFernflowerPreferences.INDENT_STRING);
@@ -42,17 +32,6 @@ public class TextBuffer {
     myStringBuilder = new StringBuilder(text);
   }
 
-  public void setCurrentLine(int line) {
-    setLineMapping(line, myStringBuilder.length()+1);
-  }
-
-  public void setLineMapping(int line, int offset) {
-    if (line >= 0) {
-      checkMapCreated();
-      myLineToOffsetMapping.put(line, offset);
-    }
-  }
-
   public TextBuffer append(String str) {
     myStringBuilder.append(str);
     return this;
@@ -81,7 +60,8 @@ public class TextBuffer {
   }
 
   public TextBuffer prepend(String s) {
-    insert(0, s);
+    myStringBuilder.insert(0, s);
+    shiftMapping(s.length());
     return this;
   }
 
@@ -116,7 +96,7 @@ public class TextBuffer {
       int currentLine = 0;
       int previousMarkLine = 0;
       int dumpedLines = 0;
-      ArrayList<Integer> linesWithMarks = new ArrayList<Integer>(myLineToOffsetMapping.keySet());
+      ArrayList<Integer> linesWithMarks = new ArrayList<>(myLineToOffsetMapping.keySet());
       Collections.sort(linesWithMarks);
       for (Integer markLine : linesWithMarks) {
         Integer markOffset = myLineToOffsetMapping.get(markLine);
@@ -192,20 +172,15 @@ public class TextBuffer {
     return myStringBuilder.length();
   }
 
-  public String substring(int start) {
-    return myStringBuilder.substring(start);
-  }
-
-  public TextBuffer setStart(int position) {
+  public void setStart(int position) {
     myStringBuilder.delete(0, position);
-    shiftMapping(0, -position);
-    return this;
+    shiftMapping(-position);
   }
 
   public void setLength(int position) {
     myStringBuilder.setLength(position);
     if (myLineToOffsetMapping != null) {
-      HashMap<Integer, Integer> newMap = new HashMap<Integer, Integer>();
+      Map<Integer, Integer> newMap = new HashMap<>();
       for (Map.Entry<Integer, Integer> entry : myLineToOffsetMapping.entrySet()) {
         if (entry.getValue() <= position) {
           newMap.put(entry.getKey(), entry.getValue());
@@ -226,12 +201,12 @@ public class TextBuffer {
     return this;
   }
 
-  private void shiftMapping(int startOffset, int shiftOffset) {
+  private void shiftMapping(int shiftOffset) {
     if (myLineToOffsetMapping != null) {
-      HashMap<Integer, Integer> newMap = new HashMap<Integer, Integer>();
+      Map<Integer, Integer> newMap = new HashMap<>();
       for (Map.Entry<Integer, Integer> entry : myLineToOffsetMapping.entrySet()) {
         int newValue = entry.getValue();
-        if (newValue >= startOffset) {
+        if (newValue >= 0) {
           newValue += shiftOffset;
         }
         if (newValue >= 0) {
@@ -244,16 +219,10 @@ public class TextBuffer {
 
   private void checkMapCreated() {
     if (myLineToOffsetMapping == null) {
-      myLineToOffsetMapping = new HashMap<Integer, Integer>();
+      myLineToOffsetMapping = new HashMap<>();
     }
   }
 
-  public TextBuffer insert(int offset, String s) {
-    myStringBuilder.insert(offset, s);
-    shiftMapping(offset, s.length());
-    return this;
-  }
-
   public int countLines() {
     return countLines(0);
   }
@@ -275,7 +244,7 @@ public class TextBuffer {
     if (srcLines.size() < 2 || srcLines.size() <= requiredLineNumber) {
       return srcLines;
     }
-    List<String> res = new LinkedList<String>(srcLines);
+    List<String> res = new LinkedList<>(srcLines);
     // first join lines with a single { or }
     for (int i = res.size()-1; i > 0 ; i--) {
       String s = res.get(i);
@@ -301,23 +270,16 @@ public class TextBuffer {
     return res;
   }
 
-  public StringBuilder getOriginalText() {
-    return myStringBuilder;
-  }
-
   private Map<Integer, Set<Integer>> myLineMapping = null; // new to original
+
   public void dumpOriginalLineNumbers(int[] lineMapping) {
     if (lineMapping.length > 0) {
-      myLineMapping = new HashMap<Integer, Set<Integer>>();
-      for (int i = 0; i < lineMapping.length; i+=2) {
+      myLineMapping = new HashMap<>();
+      for (int i = 0; i < lineMapping.length; i += 2) {
         int key = lineMapping[i + 1];
-        Set<Integer> existing = myLineMapping.get(key);
-        if (existing == null) {
-          existing = new TreeSet<Integer>();
-          myLineMapping.put(key, existing);
-        }
+        Set<Integer> existing = myLineMapping.computeIfAbsent(key, k -> new TreeSet<>());
         existing.add(lineMapping[i]);
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/util/TextUtil.java b/src/org/jetbrains/java/decompiler/util/TextUtil.java
index 21f10e4..3d92d2e 100644
--- a/src/org/jetbrains/java/decompiler/util/TextUtil.java
+++ b/src/org/jetbrains/java/decompiler/util/TextUtil.java
@@ -1,24 +1,11 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
  */
 package org.jetbrains.java.decompiler.util;
 
 import org.jetbrains.java.decompiler.code.CodeConstants;
 import org.jetbrains.java.decompiler.main.ClassesProcessor;
 import org.jetbrains.java.decompiler.main.DecompilerContext;
-import org.jetbrains.java.decompiler.main.TextBuffer;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor;
 
@@ -44,12 +31,14 @@ public class TextUtil {
     if (length == 0) return "";
     StringBuilder buf = new StringBuilder();
     String indent = (String)DecompilerContext.getProperty(IFernflowerPreferences.INDENT_STRING);
-    while (length-- > 0) {
-      buf.append(indent);
-    }
+    append(buf, indent, length);
     return buf.toString();
   }
 
+  public static void append(StringBuilder buf, String string, int times) {
+    while (times-- > 0) buf.append(string);
+  }
+
   public static boolean isPrintableUnicode(char c) {
     int t = Character.getType(c);
     return t != Character.UNASSIGNED && t != Character.LINE_SEPARATOR && t != Character.PARAGRAPH_SEPARATOR &&
@@ -81,6 +70,215 @@ public class TextUtil {
   }
 
   private static boolean isKeyword(String id, int version) {
-    return KEYWORDS.contains(id) || version > CodeConstants.BYTECODE_JAVA_5 && "enum".equals(id);
+    return KEYWORDS.contains(id) || version >= CodeConstants.BYTECODE_JAVA_5 && "enum".equals(id);
   }
+
+  public static String getInstructionName(int opcode) {
+    return opcodeNames[opcode];
+  }
+
+  private static final String[] opcodeNames = {
+    "nop",
+    "aconst_null",
+    "iconst_m1",
+    "iconst_0",
+    "iconst_1",
+    "iconst_2",
+    "iconst_3",
+    "iconst_4",
+    "iconst_5",
+    "lconst_0",
+    "lconst_1",
+    "fconst_0",
+    "fconst_1",
+    "fconst_2",
+    "dconst_0",
+    "dconst_1",
+    "bipush",
+    "sipush",
+    "ldc",
+    "ldc_w",
+    "ldc2_w",
+    "iload",
+    "lload",
+    "fload",
+    "dload",
+    "aload",
+    "iload_0",
+    "iload_1",
+    "iload_2",
+    "iload_3",
+    "lload_0",
+    "lload_1",
+    "lload_2",
+    "lload_3",
+    "fload_0",
+    "fload_1",
+    "fload_2",
+    "fload_3",
+    "dload_0",
+    "dload_1",
+    "dload_2",
+    "dload_3",
+    "aload_0",
+    "aload_1",
+    "aload_2",
+    "aload_3",
+    "iaload",
+    "laload",
+    "faload",
+    "daload",
+    "aaload",
+    "baload",
+    "caload",
+    "saload",
+    "istore",
+    "lstore",
+    "fstore",
+    "dstore",
+    "astore",
+    "istore_0",
+    "istore_1",
+    "istore_2",
+    "istore_3",
+    "lstore_0",
+    "lstore_1",
+    "lstore_2",
+    "lstore_3",
+    "fstore_0",
+    "fstore_1",
+    "fstore_2",
+    "fstore_3",
+    "dstore_0",
+    "dstore_1",
+    "dstore_2",
+    "dstore_3",
+    "astore_0",
+    "astore_1",
+    "astore_2",
+    "astore_3",
+    "iastore",
+    "lastore",
+    "fastore",
+    "dastore",
+    "aastore",
+    "bastore",
+    "castore",
+    "sastore",
+    "pop",
+    "pop2",
+    "dup",
+    "dup_x1",
+    "dup_x2",
+    "dup2",
+    "dup2_x1",
+    "dup2_x2",
+    "swap",
+    "iadd",
+    "ladd",
+    "fadd",
+    "dadd",
+    "isub",
+    "lsub",
+    "fsub",
+    "dsub",
+    "imul",
+    "lmul",
+    "fmul",
+    "dmul",
+    "idiv",
+    "ldiv",
+    "fdiv",
+    "ddiv",
+    "irem",
+    "lrem",
+    "frem",
+    "drem",
+    "ineg",
+    "lneg",
+    "fneg",
+    "dneg",
+    "ishl",
+    "lshl",
+    "ishr",
+    "lshr",
+    "iushr",
+    "lushr",
+    "iand",
+    "land",
+    "ior",
+    "lor",
+    "ixor",
+    "lxor",
+    "iinc",
+    "i2l",
+    "i2f",
+    "i2d",
+    "l2i",
+    "l2f",
+    "l2d",
+    "f2i",
+    "f2l",
+    "f2d",
+    "d2i",
+    "d2l",
+    "d2f",
+    "i2b",
+    "i2c",
+    "i2s",
+    "lcmp",
+    "fcmpl",
+    "fcmpg",
+    "dcmpl",
+    "dcmpg",
+    "ifeq",
+    "ifne",
+    "iflt",
+    "ifge",
+    "ifgt",
+    "ifle",
+    "if_icmpeq",
+    "if_icmpne",
+    "if_icmplt",
+    "if_icmpge",
+    "if_icmpgt",
+    "if_icmple",
+    "if_acmpeq",
+    "if_acmpne",
+    "goto",
+    "jsr",
+    "ret",
+    "tableswitch",
+    "lookupswitch",
+    "ireturn",
+    "lreturn",
+    "freturn",
+    "dreturn",
+    "areturn",
+    "return",
+    "getstatic",
+    "putstatic",
+    "getfield",
+    "putfield",
+    "invokevirtual",
+    "invokespecial",
+    "invokestatic",
+    "invokeinterface",
+    "invokedynamic",  // since Java 7
+    "new",
+    "newarray",
+    "anewarray",
+    "arraylength",
+    "athrow",
+    "checkcast",
+    "instanceof",
+    "monitorenter",
+    "monitorexit",
+    "wide",
+    "multianewarray",
+    "ifnull",
+    "ifnonnull",
+    "goto_w",
+    "jsr_w"
+  };
 }
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java b/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
index cdc1762..4454337 100644
--- a/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
+++ b/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
@@ -1,30 +1,15 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 
 public class VBStyleCollection<E, K> extends ArrayList<E> {
 
-  private HashMap<K, Integer> map = new HashMap<K, Integer>();
+  private HashMap<K, Integer> map = new HashMap<>();
 
-  private ArrayList<K> lstKeys = new ArrayList<K>();
+  private ArrayList<K> lstKeys = new ArrayList<>();
 
   public VBStyleCollection() {
     super();
@@ -32,24 +17,23 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
 
   public VBStyleCollection(int initialCapacity) {
     super(initialCapacity);
-    lstKeys = new ArrayList<K>(initialCapacity);
-    map = new HashMap<K, Integer>(initialCapacity);
-  }
-
-  public VBStyleCollection(Collection<E> c) {
-    super(c);
+    lstKeys = new ArrayList<>(initialCapacity);
+    map = new HashMap<>(initialCapacity);
   }
 
+  @Override
   public boolean add(E element) {
     lstKeys.add(null);
     super.add(element);
     return true;
   }
 
+  @Override
   public boolean remove(Object element) {   // TODO: error on void remove(E element)
     throw new RuntimeException("not implemented!");
   }
 
+  @Override
   public boolean addAll(Collection<? extends E> c) {
     for (int i = c.size() - 1; i >= 0; i--) {
       lstKeys.add(null);
@@ -57,12 +41,6 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
     return super.addAll(c);
   }
 
-  public void addAllWithKey(VBStyleCollection<E, K> c) {
-    for (int i = 0; i < c.size(); i++) {
-      addWithKey(c.get(i), c.getKey(i));
-    }
-  }
-
   public void addAllWithKey(Collection<E> elements, Collection<K> keys) {
     int index = super.size();
 
@@ -92,6 +70,7 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
     return null;
   }
 
+  @Override
   public void add(int index, E element) {
     addToListIndex(index, 1);
     lstKeys.add(index, null);
@@ -100,19 +79,20 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
 
   public void addWithKeyAndIndex(int index, E element, K key) {
     addToListIndex(index, 1);
-    map.put(key, new Integer(index));
+    map.put(key, index);
     super.add(index, element);
     lstKeys.add(index, key);
   }
 
   public void removeWithKey(K key) {
-    int index = map.get(key).intValue();
+    int index = map.get(key);
     addToListIndex(index + 1, -1);
     super.remove(index);
     lstKeys.remove(index);
     map.remove(key);
   }
 
+  @Override
   public E remove(int index) {
     addToListIndex(index + 1, -1);
     K obj = lstKeys.get(index);
@@ -128,11 +108,11 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
     if (index == null) {
       return null;
     }
-    return super.get(index.intValue());
+    return super.get(index);
   }
 
   public int getIndexByKey(K key) {
-    return map.get(key).intValue();
+    return map.get(key);
   }
 
   public E getLast() {
@@ -143,40 +123,22 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
     return map.containsKey(key);
   }
 
+  @Override
   public void clear() {
     map.clear();
     lstKeys.clear();
     super.clear();
   }
 
+  @Override
   public VBStyleCollection<E, K> clone() {
-    VBStyleCollection<E, K> c = new VBStyleCollection<E, K>();
-    c.addAll(new ArrayList<E>(this));
-    c.setMap(new HashMap<K, Integer>(map));
-    c.setLstKeys(new ArrayList<K>(lstKeys));
+    VBStyleCollection<E, K> c = new VBStyleCollection<>();
+    c.addAll(new ArrayList<>(this));
+    c.setMap(new HashMap<>(map));
+    c.setLstKeys(new ArrayList<>(lstKeys));
     return c;
   }
 
-  public void swap(int index1, int index2) {
-
-    Collections.swap(this, index1, index2);
-    Collections.swap(lstKeys, index1, index2);
-
-    K key = lstKeys.get(index1);
-    if (key != null) {
-      map.put(key, new Integer(index1));
-    }
-
-    key = lstKeys.get(index2);
-    if (key != null) {
-      map.put(key, new Integer(index2));
-    }
-  }
-
-  public HashMap<K, Integer> getMap() {
-    return map;
-  }
-
   public void setMap(HashMap<K, Integer> map) {
     this.map = map;
   }
@@ -197,8 +159,8 @@ public class VBStyleCollection<E, K> extends ArrayList<E> {
     for (int i = lstKeys.size() - 1; i >= index; i--) {
       K obj = lstKeys.get(i);
       if (obj != null) {
-        map.put(obj, new Integer(i + diff));
+        map.put(obj, i + diff);
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java b/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
index 1b5353b..810c9ec 100644
--- a/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
+++ b/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java
@@ -1,21 +1,6 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler;
 
-import org.hamcrest.Matchers;
 import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
 import org.jetbrains.java.decompiler.util.InterpreterUtil;
 import org.junit.After;
@@ -27,7 +12,7 @@ import java.util.Enumeration;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import static org.junit.Assert.assertThat;
+import static org.jetbrains.java.decompiler.DecompilerTestFixture.assertFilesEqual;
 import static org.junit.Assert.assertTrue;
 
 public class BulkDecompilationTest {
@@ -51,60 +36,50 @@ public class BulkDecompilationTest {
     unpack(new File(fixture.getTestDataDir(), "bulk.jar"), classes);
 
     ConsoleDecompiler decompiler = fixture.getDecompiler();
-    decompiler.addSpace(classes, true);
+    decompiler.addSource(classes);
     decompiler.decompileContext();
 
-    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), fixture.getTargetDir());
+    assertFilesEqual(new File(fixture.getTestDataDir(), "bulk"), fixture.getTargetDir());
   }
 
   @Test
   public void testJar() {
+    doTestJar("bulk");
+  }
+
+  @Test
+  public void testObfuscated() {
+    doTestJar("obfuscated");
+  }
+
+  private void doTestJar(String name) {
     ConsoleDecompiler decompiler = fixture.getDecompiler();
-    decompiler.addSpace(new File(fixture.getTestDataDir(), "bulk.jar"), true);
+    String jarName = name + ".jar";
+    decompiler.addSource(new File(fixture.getTestDataDir(), jarName));
     decompiler.decompileContext();
 
     File unpacked = new File(fixture.getTempDir(), "unpacked");
-    unpack(new File(fixture.getTargetDir(), "bulk.jar"), unpacked);
+    unpack(new File(fixture.getTargetDir(), jarName), unpacked);
 
-    compareDirectories(new File(fixture.getTestDataDir(), "bulk"), unpacked);
+    assertFilesEqual(new File(fixture.getTestDataDir(), name), unpacked);
   }
 
   private static void unpack(File archive, File targetDir) {
-    try {
-      ZipFile zip = new ZipFile(archive);
-      try {
-        Enumeration<? extends ZipEntry> entries = zip.entries();
-        while (entries.hasMoreElements()) {
-          ZipEntry entry = entries.nextElement();
-          if (!entry.isDirectory()) {
-            File file = new File(targetDir, entry.getName());
-            assertTrue(file.getParentFile().mkdirs() || file.getParentFile().isDirectory());
-            InputStream in = zip.getInputStream(entry);
-            OutputStream out = new FileOutputStream(file);
+    try (ZipFile zip = new ZipFile(archive)) {
+      Enumeration<? extends ZipEntry> entries = zip.entries();
+      while (entries.hasMoreElements()) {
+        ZipEntry entry = entries.nextElement();
+        if (!entry.isDirectory()) {
+          File file = new File(targetDir, entry.getName());
+          assertTrue(file.getParentFile().mkdirs() || file.getParentFile().isDirectory());
+          try (InputStream in = zip.getInputStream(entry); OutputStream out = new FileOutputStream(file)) {
             InterpreterUtil.copyStream(in, out);
-            out.close();
-            in.close();
           }
         }
       }
-      finally {
-        zip.close();
-      }
     }
     catch (IOException e) {
       throw new RuntimeException(e);
     }
   }
-
-  private static void compareDirectories(File expected, File actual) {
-    String[] expectedList = expected.list();
-    String[] actualList = actual.list();
-    assertThat(actualList, Matchers.arrayContainingInAnyOrder(expectedList));
-    for (String name : expectedList) {
-      File child = new File(expected, name);
-      if (child.isDirectory()) {
-        compareDirectories(child, new File(actual, name));
-      }
-    }
-  }
-}
+}
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/ConverterHelperTest.java b/test/org/jetbrains/java/decompiler/ConverterHelperTest.java
new file mode 100644
index 0000000..d05a848
--- /dev/null
+++ b/test/org/jetbrains/java/decompiler/ConverterHelperTest.java
@@ -0,0 +1,88 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package org.jetbrains.java.decompiler;
+
+import org.jetbrains.java.decompiler.code.CodeConstants;
+import org.jetbrains.java.decompiler.main.extern.IIdentifierRenamer.Type;
+import org.jetbrains.java.decompiler.modules.renamer.ConverterHelper;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+public class ConverterHelperTest {
+  private static final String VALID_CLASS_NAME = "ValidClassName";
+  private static final String VALID_FIELD_NAME = "validFieldName";
+  private static final String VALID_METHOD_NAME = "validMethodName";
+  private static final String VALID_FIELD_DESCRIPTOR = "I";
+  private static final String VALID_METHOD_DESCRIPTOR = "()V";
+
+  @Test public void testValidClassName() { doTestClassName(VALID_CLASS_NAME, false); }
+  @Test public void testValidFieldName() { doTestFieldName(VALID_FIELD_NAME, VALID_FIELD_DESCRIPTOR, false); }
+  @Test public void testValidMethodName() { doTestMethodName(VALID_METHOD_NAME, VALID_METHOD_DESCRIPTOR, false); }
+
+  @Test public void testNullClassName() { doTestClassName(null, true); }
+  @Test public void testNullFieldName() { doTestFieldName(null, VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testNullMethodName() { doTestMethodName(null, VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testEmptyClassName() { doTestClassName("", true); }
+  @Test public void testEmptyFieldName() { doTestFieldName("", VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testEmptyMethodName() { doTestMethodName("", VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testShortClassName() { doTestClassName("C", true); }
+  @Test public void testShortFieldName() { doTestFieldName("f", VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testShortMethodName() { doTestMethodName("m", VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testUnderscoreClassName() { doTestClassName("_", true); }
+  @Test public void testUnderscoreFieldName() { doTestFieldName("_", VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testUnderscoreMethodName() { doTestMethodName("_", VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testKeywordClassName() { doTestClassName("public", true); }
+  @Test public void testKeywordFieldName() { doTestFieldName("public", VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testKeywordMethodName() { doTestMethodName("public", VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testReservedWindowsNamespaceClassName() { doTestClassName("nul", true); }
+  @Test public void testReservedWindowsNamespaceFieldName() { doTestFieldName("nul", VALID_FIELD_DESCRIPTOR, false); }
+  @Test public void testReservedWindowsNamespaceName() { doTestMethodName("nul", VALID_METHOD_DESCRIPTOR, false); }
+
+  @Test public void testLeadingDigitClassName() { doTestClassName("4identifier", true); }
+  @Test public void testLeadingDigitFieldName() { doTestFieldName("4identifier", VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testLeadingDigitMethodName() { doTestMethodName("4identifier", VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testInvalidLeadingCharClassName() { doTestClassName("\uFEFFClassName", true); }
+  @Test public void testInvalidLeadingCharFieldName() { doTestFieldName("\uFEFFfieldName", VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testInvalidLeadingCharMethodName() { doTestMethodName("\uFEFFmethodName", VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testInvalidMiddleCharClassName() { doTestClassName("Class\uFEFFName", true); }
+  @Test public void testInvalidMiddleCharFieldName() { doTestFieldName("field\uFEFFName", VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testInvalidMiddleCharMethodName() { doTestMethodName("method\uFEFFName", VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testInvalidTrailingCharClassName() { doTestClassName("ClassName\uFEFF", true); }
+  @Test public void testInvalidTrailingCharFieldName() { doTestFieldName("fieldName\uFEFF", VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testInvalidTrailingCharMethodName() { doTestMethodName("methodName\uFEFF", VALID_METHOD_DESCRIPTOR, true); }
+
+  @Test public void testLtInitGtClassName() { doTestClassName(CodeConstants.INIT_NAME, true); }
+  @Test public void testLtInitGtFieldName() { doTestFieldName(CodeConstants.INIT_NAME, VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testLtInitGtMethodName() { doTestMethodName(CodeConstants.INIT_NAME, VALID_METHOD_DESCRIPTOR, false); }
+
+  @Test public void testLtClinitGtClassName() { doTestClassName(CodeConstants.CLINIT_NAME, true); }
+  @Test public void testLtClinitGtFieldName() { doTestFieldName(CodeConstants.CLINIT_NAME, VALID_FIELD_DESCRIPTOR, true); }
+  @Test public void testLtClinitGtMethodName() { doTestMethodName(CodeConstants.CLINIT_NAME, VALID_METHOD_DESCRIPTOR, false); }
+
+  private static void doTestClassName(String className, boolean shallBeRenamed) {
+    doTest(Type.ELEMENT_CLASS, className, null, null, shallBeRenamed);
+  }
+
+  private static void doTestFieldName(String element, String descriptor, boolean shallBeRenamed) {
+    doTest(Type.ELEMENT_FIELD, VALID_CLASS_NAME, element, descriptor, shallBeRenamed);
+  }
+
+  private static void doTestMethodName(String element, String descriptor, boolean shallBeRenamed) {
+    doTest(Type.ELEMENT_METHOD, VALID_CLASS_NAME, element, descriptor, shallBeRenamed);
+  }
+
+  private static void doTest(Type elementType, String className, String element, String descriptor, boolean shallBeRenamed) {
+    boolean result = new ConverterHelper().toBeRenamed(elementType, className, element, descriptor);
+    String assertionMessage = shallBeRenamed ? "Identifier { %s, %s, %s, %s } shall be renamed" : "Identifier { %s, %s, %s, %s } shall not be renamed";
+
+    assertTrue(String.format(assertionMessage, elementType.toString(), className, element, descriptor), result == shallBeRenamed);
+  }
+}
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
index d0d869c..4c5641f 100644
--- a/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
+++ b/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java
@@ -1,70 +1,65 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler;
 
 import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
+import org.jetbrains.java.decompiler.main.decompiler.PrintStreamLogger;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+import org.jetbrains.java.decompiler.util.InterpreterUtil;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Collections;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertTrue;
 
 public class DecompilerTestFixture {
   private File testDataDir;
   private File tempDir;
   private File targetDir;
-  private ConsoleDecompiler decompiler;
+  private TestConsoleDecompiler decompiler;
 
-  public void setUp() throws IOException {
-    setUp(Collections.<String, Object>emptyMap());
-  }
+  public void setUp(String... optionPairs) throws IOException {
+    assertThat(optionPairs.length % 2).isEqualTo(0);
 
-  public void setUp(final Map<String, Object> options) throws IOException {
     testDataDir = new File("testData");
     if (!isTestDataDir(testDataDir)) testDataDir = new File("community/plugins/java-decompiler/engine/testData");
     if (!isTestDataDir(testDataDir)) testDataDir = new File("plugins/java-decompiler/engine/testData");
     if (!isTestDataDir(testDataDir)) testDataDir = new File("../community/plugins/java-decompiler/engine/testData");
     if (!isTestDataDir(testDataDir)) testDataDir = new File("../plugins/java-decompiler/engine/testData");
     assertTrue("current dir: " + new File("").getAbsolutePath(), isTestDataDir(testDataDir));
+    testDataDir = testDataDir.getAbsoluteFile();
 
     //noinspection SSBasedInspection
     tempDir = File.createTempFile("decompiler_test_", "_dir");
-    assertTrue(tempDir.delete());
+    assertThat(tempDir.delete()).isTrue();
 
     targetDir = new File(tempDir, "decompiled");
-    assertTrue(targetDir.mkdirs());
-    decompiler = new ConsoleDecompiler(this.targetDir, new HashMap<String, Object>() {{
-      put(IFernflowerPreferences.LOG_LEVEL, "warn");
-      put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES, "1");
-      put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
-      put(IFernflowerPreferences.REMOVE_BRIDGE, "1");
-      put(IFernflowerPreferences.LITERALS_AS_IS, "1");
-      put(IFernflowerPreferences.UNIT_TEST_MODE, "1");
-      putAll(options);
-    }});
+    assertThat(targetDir.mkdirs()).isTrue();
+
+    Map<String, Object> options = new HashMap<>();
+    options.put(IFernflowerPreferences.LOG_LEVEL, "warn");
+    options.put(IFernflowerPreferences.DECOMPILE_GENERIC_SIGNATURES, "1");
+    options.put(IFernflowerPreferences.REMOVE_SYNTHETIC, "1");
+    options.put(IFernflowerPreferences.REMOVE_BRIDGE, "1");
+    options.put(IFernflowerPreferences.LITERALS_AS_IS, "1");
+    options.put(IFernflowerPreferences.UNIT_TEST_MODE, "1");
+    for (int i = 0; i < optionPairs.length; i += 2) {
+      options.put(optionPairs[i], optionPairs[i + 1]);
+    }
+    decompiler = new TestConsoleDecompiler(targetDir, options);
   }
 
   public void tearDown() {
     if (tempDir != null) {
       delete(tempDir);
     }
+    decompiler.close();
   }
 
   public File getTestDataDir() {
@@ -96,4 +91,65 @@ public class DecompilerTestFixture {
     }
     assertTrue(file.delete());
   }
-}
+
+  public static void assertFilesEqual(File expected, File actual) {
+    if (expected.isDirectory()) {
+      String[] children = Objects.requireNonNull(expected.list());
+      assertThat(actual.list()).contains(children);
+      for (String name : children) {
+        assertFilesEqual(new File(expected, name), new File(actual, name));
+      }
+    }
+    else {
+      assertThat(getContent(actual)).isEqualTo(getContent(expected));
+    }
+  }
+
+  private static String getContent(File expected) {
+    try {
+      return new String(InterpreterUtil.getBytes(expected), StandardCharsets.UTF_8).replace("\r\n", "\n");
+    }
+    catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  // cache zip files
+  private static class TestConsoleDecompiler extends ConsoleDecompiler {
+    private final HashMap<String, ZipFile> zipFiles = new HashMap<>();
+
+    TestConsoleDecompiler(File destination, Map<String, Object> options) {
+      super(destination, options, new PrintStreamLogger(System.out));
+    }
+
+    @Override
+    public byte[] getBytecode(String externalPath, String internalPath) throws IOException {
+      File file = new File(externalPath);
+      if (internalPath == null) {
+        return InterpreterUtil.getBytes(file);
+      }
+      else {
+        ZipFile archive = zipFiles.get(file.getName());
+        if (archive == null) {
+          archive = new ZipFile(file);
+          zipFiles.put(file.getName(), archive);
+        }
+        ZipEntry entry = archive.getEntry(internalPath);
+        if (entry == null) throw new IOException("Entry not found: " + internalPath);
+        return InterpreterUtil.getBytes(archive, entry);
+      }
+    }
+
+    void close() {
+      for (ZipFile file : zipFiles.values()) {
+        try {
+          file.close();
+        }
+        catch (IOException e) {
+          e.printStackTrace();
+        }
+      }
+      zipFiles.clear();
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/LineNumbersMatchTest.java b/test/org/jetbrains/java/decompiler/LineNumbersMatchTest.java
deleted file mode 100644
index 758aa5f..0000000
--- a/test/org/jetbrains/java/decompiler/LineNumbersMatchTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler;
-
-import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class LineNumbersMatchTest extends SingleClassesTestBase {
-  @Override
-  protected Map<String, Object> getDecompilerOptions() {
-    return new HashMap<String, Object>() {{
-      put(IFernflowerPreferences.USE_DEBUG_LINE_NUMBERS, "1");
-    }};
-  }
-
-  @Test public void testMatch1() { doTest("pkg/TestLineNumbersMatch"); }
-}
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
index d8f6bee..1d0dc62 100644
--- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java
+++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java
@@ -1,36 +1,42 @@
-/*
- * Copyright 2000-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler;
 
+import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
-public class SingleClassesTest extends SingleClassesTestBase {
-  @Override
-  protected Map<String, Object> getDecompilerOptions() {
-    return new HashMap<String, Object>() {{
-      put(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1");
-      put(IFernflowerPreferences.DUMP_ORIGINAL_LINES, "1");
-    }};
+import static org.jetbrains.java.decompiler.DecompilerTestFixture.assertFilesEqual;
+import static org.junit.Assert.assertTrue;
+
+public class SingleClassesTest {
+  private DecompilerTestFixture fixture;
+
+  @Before
+  public void setUp() throws IOException {
+    fixture = new DecompilerTestFixture();
+    fixture.setUp(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1",
+                  IFernflowerPreferences.DUMP_ORIGINAL_LINES, "1",
+                  IFernflowerPreferences.IGNORE_INVALID_BYTECODE, "1",
+                  IFernflowerPreferences.VERIFY_ANONYMOUS_CLASSES, "1");
   }
 
+  @After
+  public void tearDown() {
+    fixture.tearDown();
+    fixture = null;
+  }
+
+  @Test public void testPrimitiveNarrowing() { doTest("pkg/TestPrimitiveNarrowing"); }
   @Test public void testClassFields() { doTest("pkg/TestClassFields"); }
+  @Test public void testInterfaceFields() { doTest("pkg/TestInterfaceFields"); }
   @Test public void testClassLambda() { doTest("pkg/TestClassLambda"); }
   @Test public void testClassLoop() { doTest("pkg/TestClassLoop"); }
   @Test public void testClassSwitch() { doTest("pkg/TestClassSwitch"); }
@@ -41,11 +47,13 @@ public class SingleClassesTest extends SingleClassesTestBase {
   @Test public void testDeprecations() { doTest("pkg/TestDeprecations"); }
   @Test public void testExtendsList() { doTest("pkg/TestExtendsList"); }
   @Test public void testMethodParameters() { doTest("pkg/TestMethodParameters"); }
+  @Test public void testMethodParametersAttr() { doTest("pkg/TestMethodParametersAttr"); }
   @Test public void testCodeConstructs() { doTest("pkg/TestCodeConstructs"); }
   @Test public void testConstants() { doTest("pkg/TestConstants"); }
   @Test public void testEnum() { doTest("pkg/TestEnum"); }
   @Test public void testDebugSymbols() { doTest("pkg/TestDebugSymbols"); }
   @Test public void testInvalidMethodSignature() { doTest("InvalidMethodSignature"); }
+  @Test public void testAnonymousClassConstructor() { doTest("pkg/TestAnonymousClassConstructor"); }
   @Test public void testInnerClassConstructor() { doTest("pkg/TestInnerClassConstructor"); }
   @Test public void testInnerClassConstructor11() { doTest("v11/TestInnerClassConstructor"); }
   @Test public void testTryCatchFinally() { doTest("pkg/TestTryCatchFinally"); }
@@ -58,6 +66,107 @@ public class SingleClassesTest extends SingleClassesTestBase {
   @Test public void testAnonymousClass() { doTest("pkg/TestAnonymousClass"); }
   @Test public void testThrowException() { doTest("pkg/TestThrowException"); }
   @Test public void testInnerLocal() { doTest("pkg/TestInnerLocal"); }
-  @Test public void testInnerLocalPkg() { doTest("pkg/TestInnerLocalPkg"); }
   @Test public void testInnerSignature() { doTest("pkg/TestInnerSignature"); }
-}
+  @Test public void testAnonymousSignature() { doTest("pkg/TestAnonymousSignature"); }
+  @Test public void testLocalsSignature() { doTest("pkg/TestLocalsSignature"); }
+  @Test public void testParameterizedTypes() { doTest("pkg/TestParameterizedTypes"); }
+  @Test public void testShadowing() { doTest("pkg/TestShadowing", "pkg/Shadow", "ext/Shadow",
+           "pkg/TestShadowingSuperClass"); }
+  @Test public void testStringConcat() { doTest("pkg/TestStringConcat"); }
+  @Test public void testJava9StringConcat() { doTest("java9/TestJava9StringConcat"); }
+  @Test public void testJava11StringConcat() { doTest("java11/TestJava11StringConcat"); }
+  @Test public void testMethodReferenceSameName() { doTest("pkg/TestMethodReferenceSameName"); }
+  @Test public void testMethodReferenceLetterClass() { doTest("pkg/TestMethodReferenceLetterClass"); }
+  @Test public void testConstructorReference() { doTest("pkg/TestConstructorReference"); }
+  @Test public void testMemberAnnotations() { doTest("pkg/TestMemberAnnotations"); }
+  @Test public void testMoreAnnotations() { doTest("pkg/MoreAnnotations"); }
+  @Test public void testTypeAnnotations() { doTest("pkg/TypeAnnotations"); }
+  @Test public void testStaticNameClash() { doTest("pkg/TestStaticNameClash"); }
+  @Test public void testExtendingSubclass() { doTest("pkg/TestExtendingSubclass"); }
+  @Test public void testSyntheticAccess() { doTest("pkg/TestSyntheticAccess"); }
+  @Test public void testIllegalVarName() { doTest("pkg/TestIllegalVarName"); }
+  @Test public void testIffSimplification() { doTest("pkg/TestIffSimplification"); }
+  @Test public void testKotlinConstructor() { doTest("pkg/TestKotlinConstructorKt"); }
+  @Test public void testAsserts() { doTest("pkg/TestAsserts"); }
+  @Test public void testLocalsNames() { doTest("pkg/TestLocalsNames"); }
+  @Test public void testAnonymousParamNames() { doTest("pkg/TestAnonymousParamNames"); }
+  @Test public void testAnonymousParams() { doTest("pkg/TestAnonymousParams"); }
+  @Test public void testAccessReplace() { doTest("pkg/TestAccessReplace"); }
+  @Test public void testStringLiterals() { doTest("pkg/TestStringLiterals"); }
+  @Test public void testPrimitives() { doTest("pkg/TestPrimitives"); }
+  @Test public void testClashName() { doTest("pkg/TestClashName", "pkg/SharedName1",
+          "pkg/SharedName2", "pkg/SharedName3", "pkg/SharedName4", "pkg/NonSharedName",
+          "pkg/TestClashNameParent", "ext/TestClashNameParent","pkg/TestClashNameIface", "ext/TestClashNameIface"); }
+  @Test public void testSwitchOnEnum() { doTest("pkg/TestSwitchOnEnum");}
+  @Test public void testVarArgCalls() { doTest("pkg/TestVarArgCalls"); }
+  @Test public void testLambdaParams() { doTest("pkg/TestLambdaParams"); }
+  @Test public void testInterfaceMethods() { doTest("pkg/TestInterfaceMethods"); }
+  @Test public void testConstType() { doTest("pkg/TestConstType"); }
+  @Test public void testPop2OneDoublePop2() { doTest("pkg/TestPop2OneDoublePop2"); }
+  @Test public void testPop2OneLongPop2() { doTest("pkg/TestPop2OneLongPop2"); }
+  @Test public void testPop2TwoIntPop2() { doTest("pkg/TestPop2TwoIntPop2"); }
+  @Test public void testPop2TwoIntTwoPop() { doTest("pkg/TestPop2TwoIntTwoPop"); }
+  @Test public void testSuperInner() { doTest("pkg/TestSuperInner", "pkg/TestSuperInnerBase"); }
+  @Test public void testMissingConstructorCallGood() { doTest("pkg/TestMissingConstructorCallGood"); }
+  @Test public void testMissingConstructorCallBad() { doTest("pkg/TestMissingConstructorCallBad"); }
+  @Test public void testEmptyBlocks() { doTest("pkg/TestEmptyBlocks"); }
+  @Test public void testPrivateEmptyConstructor() { doTest("pkg/TestPrivateEmptyConstructor"); }
+  @Test public void testSynchronizedUnprotected() { doTest("pkg/TestSynchronizedUnprotected"); }
+  @Test public void testInterfaceSuper() { doTest("pkg/TestInterfaceSuper"); }
+  @Test public void testFieldSingleAccess() { doTest("pkg/TestFieldSingleAccess"); }
+
+  // TODO: fix all below
+  //@Test public void testPackageInfo() { doTest("pkg/package-info"); }
+  //@Test public void testSwitchOnStrings() { doTest("pkg/TestSwitchOnStrings");}
+  //@Test public void testUnionType() { doTest("pkg/TestUnionType"); }
+  //@Test public void testInnerClassConstructor2() { doTest("pkg/TestInner2"); }
+  //@Test public void testInUse() { doTest("pkg/TestInUse"); }
+
+  @Test public void testGroovyClass() { doTest("pkg/TestGroovyClass"); }
+  @Test public void testGroovyTrait() { doTest("pkg/TestGroovyTrait"); }
+  @Test public void testPrivateClasses() { doTest("pkg/PrivateClasses"); }
+  @Test public void testSuspendLambda() { doTest("pkg/TestSuspendLambdaKt"); }
+  @Test public void testNamedSuspendFun2Kt() { doTest("pkg/TestNamedSuspendFun2Kt"); }
+  @Test public void testGenericArgs() { doTest("pkg/TestGenericArgs"); }
+
+  private void doTest(String testFile, String... companionFiles) {
+    ConsoleDecompiler decompiler = fixture.getDecompiler();
+
+    File classFile = new File(fixture.getTestDataDir(), "/classes/" + testFile + ".class");
+    assertTrue(classFile.isFile());
+    for (File file : collectClasses(classFile)) {
+      decompiler.addSource(file);
+    }
+
+    for (String companionFile : companionFiles) {
+      File companionClassFile = new File(fixture.getTestDataDir(), "/classes/" + companionFile + ".class");
+      assertTrue(companionClassFile.isFile());
+      for (File file : collectClasses(companionClassFile)) {
+        decompiler.addSource(file);
+      }
+    }
+
+    decompiler.decompileContext();
+
+    String testName = classFile.getName().substring(0, classFile.getName().length() - 6);
+    File decompiledFile = new File(fixture.getTargetDir(), testName + ".java");
+    assertTrue(decompiledFile.isFile());
+    File referenceFile = new File(fixture.getTestDataDir(), "results/" + testName + ".dec");
+    assertTrue(referenceFile.isFile());
+    assertFilesEqual(referenceFile, decompiledFile);
+  }
+
+  private static List<File> collectClasses(File classFile) {
+    List<File> files = new ArrayList<>();
+    files.add(classFile);
+
+    File parent = classFile.getParentFile();
+    if (parent != null) {
+      final String pattern = classFile.getName().replace(".class", "") + "\\$.+\\.class";
+      File[] inner = parent.listFiles((dir, name) -> name.matches(pattern));
+      if (inner != null) Collections.addAll(files, inner);
+    }
+
+    return files;
+  }
+}
\ No newline at end of file
diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java b/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
deleted file mode 100644
index 165f695..0000000
--- a/test/org/jetbrains/java/decompiler/SingleClassesTestBase.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.java.decompiler;
-
-import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler;
-import org.jetbrains.java.decompiler.util.InterpreterUtil;
-import org.junit.After;
-import org.junit.Before;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public abstract class SingleClassesTestBase {
-  private DecompilerTestFixture fixture;
-
-  @Before
-  public void setUp() throws IOException {
-    fixture = new DecompilerTestFixture();
-    fixture.setUp(getDecompilerOptions());
-  }
-
-  @After
-  public void tearDown() {
-    fixture.tearDown();
-    fixture = null;
-  }
-
-  protected Map<String, Object> getDecompilerOptions() {
-    return Collections.emptyMap();
-  }
-
-  protected void doTest(String testFile) {
-    try {
-      File classFile = new File(fixture.getTestDataDir(), "/classes/" + testFile + ".class");
-      assertTrue(classFile.isFile());
-      String testName = classFile.getName().substring(0, classFile.getName().length() - 6);
-
-      ConsoleDecompiler decompiler = fixture.getDecompiler();
-
-      for (File file : collectClasses(classFile)) decompiler.addSpace(file, true);
-      decompiler.decompileContext();
-
-      File decompiledFile = new File(fixture.getTargetDir(), testName + ".java");
-      assertTrue(decompiledFile.isFile());
-      File referenceFile = new File(fixture.getTestDataDir(), "results/" + testName + ".dec");
-      assertTrue(referenceFile.isFile());
-      compareContent(decompiledFile, referenceFile);
-    }
-    catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private static List<File> collectClasses(File classFile) {
-    List<File> files = new ArrayList<File>();
-    files.add(classFile);
-
-    File parent = classFile.getParentFile();
-    if (parent != null) {
-      final String pattern = classFile.getName().replace(".class", "") + "\\$.+\\.class";
-      File[] inner = parent.listFiles(new FilenameFilter() {
-        @Override
-        public boolean accept(File dir, String name) {
-          return name.matches(pattern);
-        }
-      });
-      if (inner != null) Collections.addAll(files, inner);
-    }
-
-    return files;
-  }
-
-  private static void compareContent(File decompiledFile, File referenceFile) throws IOException {
-    String decompiledContent = new String(InterpreterUtil.getBytes(decompiledFile), "UTF-8");
-
-    String referenceContent = new String(InterpreterUtil.getBytes(referenceFile), "UTF-8");
-    if (InterpreterUtil.IS_WINDOWS && !referenceContent.contains("\r\n")) {
-      referenceContent = referenceContent.replace("\n", "\r\n");  // fix for broken Git checkout on Windows
-    }
-
-    assertEquals(referenceContent, decompiledContent);
-  }
-}
diff --git a/testData/bulk/META-INF/MANIFEST.MF b/testData/bulk/META-INF/MANIFEST.MF
index e69de29..22f53c8 100644
--- a/testData/bulk/META-INF/MANIFEST.MF
+++ b/testData/bulk/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Created-By: 1.8.0_20 (Oracle Corporation)
+
diff --git a/testData/bulk/pkg/Main.java b/testData/bulk/pkg/Main.java
index e69de29..f22c5d2 100644
--- a/testData/bulk/pkg/Main.java
+++ b/testData/bulk/pkg/Main.java
@@ -0,0 +1,11 @@
+package pkg;
+
+import pkg.res.Loader;
+
+public class Main {
+   public static void main(String[] args) {
+      Loader loader = new Loader();
+      String resource = loader.getResource();
+      System.out.println(resource);
+   }
+}
diff --git a/testData/bulk/pkg/res/Loader.java b/testData/bulk/pkg/res/Loader.java
index e69de29..cdb1db5 100644
--- a/testData/bulk/pkg/res/Loader.java
+++ b/testData/bulk/pkg/res/Loader.java
@@ -0,0 +1,25 @@
+package pkg.res;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.net.URL;
+
+public class Loader {
+   public String getResource() {
+      URL resource = this.getClass().getClassLoader().getResource("pkg/res/resource.txt");
+      if (resource == null) {
+         throw new RuntimeException("Resource missing");
+      } else {
+         try {
+            File file = new File(resource.toURI());
+            byte[] bytes = new byte[(int)file.length()];
+            FileInputStream stream = new FileInputStream(file);
+            stream.read(bytes);
+            stream.close();
+            return new String(bytes, "UTF-8");
+         } catch (Exception var5) {
+            throw new RuntimeException("Resource load failed", var5);
+         }
+      }
+   }
+}
diff --git a/testData/classes/ext/Shadow$B.class b/testData/classes/ext/Shadow$B.class
new file mode 100644
index 0000000..eeb9d38
Binary files /dev/null and b/testData/classes/ext/Shadow$B.class differ
diff --git a/testData/classes/ext/Shadow.class b/testData/classes/ext/Shadow.class
new file mode 100644
index 0000000..e576dfd
Binary files /dev/null and b/testData/classes/ext/Shadow.class differ
diff --git a/testData/classes/ext/TestClashNameIface.class b/testData/classes/ext/TestClashNameIface.class
new file mode 100644
index 0000000..6a725cf
Binary files /dev/null and b/testData/classes/ext/TestClashNameIface.class differ
diff --git a/testData/classes/ext/TestClashNameParent.class b/testData/classes/ext/TestClashNameParent.class
new file mode 100644
index 0000000..4187761
Binary files /dev/null and b/testData/classes/ext/TestClashNameParent.class differ
diff --git a/testData/classes/java11/TestJava11StringConcat.class b/testData/classes/java11/TestJava11StringConcat.class
new file mode 100644
index 0000000..8ec1fbd
Binary files /dev/null and b/testData/classes/java11/TestJava11StringConcat.class differ
diff --git a/testData/classes/java9/TestJava9StringConcat.class b/testData/classes/java9/TestJava9StringConcat.class
new file mode 100644
index 0000000..721a0ed
Binary files /dev/null and b/testData/classes/java9/TestJava9StringConcat.class differ
diff --git a/testData/classes/pkg/MoreAnnotations$NestedAnnotation.class b/testData/classes/pkg/MoreAnnotations$NestedAnnotation.class
new file mode 100644
index 0000000..b4204ad
Binary files /dev/null and b/testData/classes/pkg/MoreAnnotations$NestedAnnotation.class differ
diff --git a/testData/classes/pkg/MoreAnnotations$TestEnum.class b/testData/classes/pkg/MoreAnnotations$TestEnum.class
new file mode 100644
index 0000000..5e4765d
Binary files /dev/null and b/testData/classes/pkg/MoreAnnotations$TestEnum.class differ
diff --git a/testData/classes/pkg/MoreAnnotations.class b/testData/classes/pkg/MoreAnnotations.class
new file mode 100644
index 0000000..85146c8
Binary files /dev/null and b/testData/classes/pkg/MoreAnnotations.class differ
diff --git a/testData/classes/pkg/NonSharedName.class b/testData/classes/pkg/NonSharedName.class
new file mode 100644
index 0000000..e3d09dd
Binary files /dev/null and b/testData/classes/pkg/NonSharedName.class differ
diff --git a/testData/classes/pkg/PrivateClasses$1$1.class b/testData/classes/pkg/PrivateClasses$1$1.class
new file mode 100644
index 0000000..d411e5b
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$1$1.class differ
diff --git a/testData/classes/pkg/PrivateClasses$1$1CapturingLocalR1.class b/testData/classes/pkg/PrivateClasses$1$1CapturingLocalR1.class
new file mode 100644
index 0000000..1a60521
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$1$1CapturingLocalR1.class differ
diff --git a/testData/classes/pkg/PrivateClasses$1$1NonCapturingLocalR1.class b/testData/classes/pkg/PrivateClasses$1$1NonCapturingLocalR1.class
new file mode 100644
index 0000000..fda112f
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$1$1NonCapturingLocalR1.class differ
diff --git a/testData/classes/pkg/PrivateClasses$1$2.class b/testData/classes/pkg/PrivateClasses$1$2.class
new file mode 100644
index 0000000..fce5703
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$1$2.class differ
diff --git a/testData/classes/pkg/PrivateClasses$1.class b/testData/classes/pkg/PrivateClasses$1.class
new file mode 100644
index 0000000..91b0752
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$1.class differ
diff --git a/testData/classes/pkg/PrivateClasses$1CapturingLocalM1.class b/testData/classes/pkg/PrivateClasses$1CapturingLocalM1.class
new file mode 100644
index 0000000..d5d27c6
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$1CapturingLocalM1.class differ
diff --git a/testData/classes/pkg/PrivateClasses$1CapturingLocalM2.class b/testData/classes/pkg/PrivateClasses$1CapturingLocalM2.class
new file mode 100644
index 0000000..cdd4c71
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$1CapturingLocalM2.class differ
diff --git a/testData/classes/pkg/PrivateClasses$1NonCapturingLocalM1.class b/testData/classes/pkg/PrivateClasses$1NonCapturingLocalM1.class
new file mode 100644
index 0000000..3e723c1
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$1NonCapturingLocalM1.class differ
diff --git a/testData/classes/pkg/PrivateClasses$1NonCapturingLocalM2.class b/testData/classes/pkg/PrivateClasses$1NonCapturingLocalM2.class
new file mode 100644
index 0000000..9d4041f
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$1NonCapturingLocalM2.class differ
diff --git a/testData/classes/pkg/PrivateClasses$2$1.class b/testData/classes/pkg/PrivateClasses$2$1.class
new file mode 100644
index 0000000..8caf4ac
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$2$1.class differ
diff --git a/testData/classes/pkg/PrivateClasses$2$1CapturingLocalR1.class b/testData/classes/pkg/PrivateClasses$2$1CapturingLocalR1.class
new file mode 100644
index 0000000..c347c66
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$2$1CapturingLocalR1.class differ
diff --git a/testData/classes/pkg/PrivateClasses$2$1NonCapturingLocalR2.class b/testData/classes/pkg/PrivateClasses$2$1NonCapturingLocalR2.class
new file mode 100644
index 0000000..f14b681
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$2$1NonCapturingLocalR2.class differ
diff --git a/testData/classes/pkg/PrivateClasses$2$2.class b/testData/classes/pkg/PrivateClasses$2$2.class
new file mode 100644
index 0000000..2c594e0
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$2$2.class differ
diff --git a/testData/classes/pkg/PrivateClasses$2.class b/testData/classes/pkg/PrivateClasses$2.class
new file mode 100644
index 0000000..b4dd294
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$2.class differ
diff --git a/testData/classes/pkg/PrivateClasses$3.class b/testData/classes/pkg/PrivateClasses$3.class
new file mode 100644
index 0000000..0058420
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$3.class differ
diff --git a/testData/classes/pkg/PrivateClasses$4.class b/testData/classes/pkg/PrivateClasses$4.class
new file mode 100644
index 0000000..f70861c
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$4.class differ
diff --git a/testData/classes/pkg/PrivateClasses$5.class b/testData/classes/pkg/PrivateClasses$5.class
new file mode 100644
index 0000000..70e8e63
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$5.class differ
diff --git a/testData/classes/pkg/PrivateClasses$6.class b/testData/classes/pkg/PrivateClasses$6.class
new file mode 100644
index 0000000..cfe9764
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$6.class differ
diff --git a/testData/classes/pkg/PrivateClasses$Callable.class b/testData/classes/pkg/PrivateClasses$Callable.class
new file mode 100644
index 0000000..2851cf4
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses$Callable.class differ
diff --git a/testData/classes/pkg/PrivateClasses.class b/testData/classes/pkg/PrivateClasses.class
new file mode 100644
index 0000000..e1e93a0
Binary files /dev/null and b/testData/classes/pkg/PrivateClasses.class differ
diff --git a/testData/classes/pkg/PrivateClasses.java b/testData/classes/pkg/PrivateClasses.java
new file mode 100644
index 0000000..6b181ab
--- /dev/null
+++ b/testData/classes/pkg/PrivateClasses.java
@@ -0,0 +1,205 @@
+package pkg;
+
+class PrivateClasses {
+  private interface Callable<T> {
+    T call();
+  }
+
+  private static final Runnable R1 = new Runnable() {
+    @Override
+    public void run() {
+      String s = "";
+
+      class NonCapturingLocalR1 {
+        private final String s;
+
+        public NonCapturingLocalR1(String s) {
+          this.s = s;
+        }
+
+        @Override
+        public String toString() {
+          return this.s;
+        }
+      }
+
+      class CapturingLocalR1 {
+        private final int i;
+
+        public CapturingLocalR1(int i) {
+          this.i = i;
+        }
+
+        @Override
+        public String toString() {
+          return s + ":" + i;
+        }
+      }
+
+      new NonCapturingLocalR1(s).toString();
+      new CapturingLocalR1(42).toString();
+
+      Callable<String> c1 = new Callable<String>() {
+        @Override
+        public String call() {
+          return null;
+        }
+      };
+
+      Callable<String> c2 = new Callable<String>() {
+        @Override
+        public String call() {
+          return s;
+        }
+      };
+
+      (c1.call() + c2.call()).length();
+    }
+  };
+
+  private final Runnable R2 = new Runnable() {
+    @Override
+    public void run() {
+      String s = "";
+
+      class NonCapturingLocalR2 {
+        private final String s;
+
+        public NonCapturingLocalR2(String s) {
+          this.s = s;
+        }
+
+        @Override
+        public String toString() {
+          return this.s;
+        }
+      }
+
+      class CapturingLocalR1 {
+        private final int i;
+
+        public CapturingLocalR1(int i) {
+          this.i = i;
+        }
+
+        @Override
+        public String toString() {
+          return s + ":" + i;
+        }
+      }
+
+      new NonCapturingLocalR2(s).toString();
+      new CapturingLocalR1(42).toString();
+
+      Callable<String> c1 = new Callable<String>() {
+        @Override
+        public String call() {
+          return null;
+        }
+      };
+
+      Callable<String> c2 = new Callable<String>() {
+        @Override
+        public String call() {
+          return s;
+        }
+      };
+
+      (c1.call() + c2.call()).length();
+    }
+  };
+
+  public static void m1(String s) {
+    class NonCapturingLocalM1 {
+      private final String s;
+
+      public NonCapturingLocalM1(String s) {
+        this.s = s;
+      }
+
+      @Override
+      public String toString() {
+        return this.s;
+      }
+    }
+
+    class CapturingLocalM1 {
+      private final int i;
+
+      public CapturingLocalM1(int i) {
+        this.i = i;
+      }
+
+      @Override
+      public String toString() {
+        return s + ":" + i;
+      }
+    }
+
+    new NonCapturingLocalM1(s).toString();
+    new CapturingLocalM1(42).toString();
+
+    Callable<String> c1 = new Callable<String>() {
+      @Override
+      public String call() {
+        return null;
+      }
+    };
+
+    Callable<String> c2 = new Callable<String>() {
+      @Override
+      public String call() {
+        return s;
+      }
+    };
+
+    (c1.call() + c2.call()).length();
+  }
+
+  public void m2(String s) {
+    class NonCapturingLocalM2 {
+      private final String s;
+
+      public NonCapturingLocalM2(String s) {
+        this.s = s;
+      }
+
+      @Override
+      public String toString() {
+        return this.s;
+      }
+    }
+
+    class CapturingLocalM2 {
+      private final int i;
+
+      public CapturingLocalM2(int i) {
+        this.i = i;
+      }
+
+      @Override
+      public String toString() {
+        return s + ":" + i;
+      }
+    }
+
+    new NonCapturingLocalM2(s).toString();
+    new CapturingLocalM2(42).toString();
+
+    Callable<String> c1 = new Callable<String>() {
+      @Override
+      public String call() {
+        return null;
+      }
+    };
+
+    Callable<String> c2 = new Callable<String>() {
+      @Override
+      public String call() {
+        return s;
+      }
+    };
+
+    (c1.call() + c2.call()).length();
+  }
+}
\ No newline at end of file
diff --git a/testData/classes/pkg/R.class b/testData/classes/pkg/R.class
new file mode 100644
index 0000000..7c9c9e2
Binary files /dev/null and b/testData/classes/pkg/R.class differ
diff --git a/testData/classes/pkg/Shadow.class b/testData/classes/pkg/Shadow.class
new file mode 100644
index 0000000..61ed27b
Binary files /dev/null and b/testData/classes/pkg/Shadow.class differ
diff --git a/testData/classes/pkg/SharedName1.class b/testData/classes/pkg/SharedName1.class
new file mode 100644
index 0000000..fbd917f
Binary files /dev/null and b/testData/classes/pkg/SharedName1.class differ
diff --git a/testData/classes/pkg/SharedName2.class b/testData/classes/pkg/SharedName2.class
new file mode 100644
index 0000000..275ab11
Binary files /dev/null and b/testData/classes/pkg/SharedName2.class differ
diff --git a/testData/classes/pkg/SharedName3.class b/testData/classes/pkg/SharedName3.class
new file mode 100644
index 0000000..f24863d
Binary files /dev/null and b/testData/classes/pkg/SharedName3.class differ
diff --git a/testData/classes/pkg/SharedName4.class b/testData/classes/pkg/SharedName4.class
new file mode 100644
index 0000000..2bfb786
Binary files /dev/null and b/testData/classes/pkg/SharedName4.class differ
diff --git a/testData/classes/pkg/SharedName5.class b/testData/classes/pkg/SharedName5.class
new file mode 100644
index 0000000..f975840
Binary files /dev/null and b/testData/classes/pkg/SharedName5.class differ
diff --git a/testData/classes/pkg/TestAccessReplace$Inner.class b/testData/classes/pkg/TestAccessReplace$Inner.class
new file mode 100644
index 0000000..a339ed0
Binary files /dev/null and b/testData/classes/pkg/TestAccessReplace$Inner.class differ
diff --git a/testData/classes/pkg/TestAccessReplace.class b/testData/classes/pkg/TestAccessReplace.class
new file mode 100644
index 0000000..e720754
Binary files /dev/null and b/testData/classes/pkg/TestAccessReplace.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$1.class b/testData/classes/pkg/TestAnonymousClassConstructor$1.class
new file mode 100644
index 0000000..5c42a2c
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$1.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$10.class b/testData/classes/pkg/TestAnonymousClassConstructor$10.class
new file mode 100644
index 0000000..fb064fa
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$10.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$11.class b/testData/classes/pkg/TestAnonymousClassConstructor$11.class
new file mode 100644
index 0000000..4cc1fb9
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$11.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$12.class b/testData/classes/pkg/TestAnonymousClassConstructor$12.class
new file mode 100644
index 0000000..c23af1a
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$12.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$2.class b/testData/classes/pkg/TestAnonymousClassConstructor$2.class
new file mode 100644
index 0000000..fb671b1
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$2.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$3.class b/testData/classes/pkg/TestAnonymousClassConstructor$3.class
new file mode 100644
index 0000000..80dd6bf
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$3.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$4.class b/testData/classes/pkg/TestAnonymousClassConstructor$4.class
new file mode 100644
index 0000000..74820ac
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$4.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$5.class b/testData/classes/pkg/TestAnonymousClassConstructor$5.class
new file mode 100644
index 0000000..c32a742
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$5.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$6.class b/testData/classes/pkg/TestAnonymousClassConstructor$6.class
new file mode 100644
index 0000000..2dde517
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$6.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$7.class b/testData/classes/pkg/TestAnonymousClassConstructor$7.class
new file mode 100644
index 0000000..6f08d90
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$7.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$8.class b/testData/classes/pkg/TestAnonymousClassConstructor$8.class
new file mode 100644
index 0000000..59b8436
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$8.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$9.class b/testData/classes/pkg/TestAnonymousClassConstructor$9.class
new file mode 100644
index 0000000..ab22f7b
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$9.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$InnerPrivate.class b/testData/classes/pkg/TestAnonymousClassConstructor$InnerPrivate.class
new file mode 100644
index 0000000..dc248af
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$InnerPrivate.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$InnerPrivateString.class b/testData/classes/pkg/TestAnonymousClassConstructor$InnerPrivateString.class
new file mode 100644
index 0000000..dd660b7
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$InnerPrivateString.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$InnerPublic.class b/testData/classes/pkg/TestAnonymousClassConstructor$InnerPublic.class
new file mode 100644
index 0000000..b984943
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$InnerPublic.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$InnerPublicString.class b/testData/classes/pkg/TestAnonymousClassConstructor$InnerPublicString.class
new file mode 100644
index 0000000..e96ecf4
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$InnerPublicString.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPrivate.class b/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPrivate.class
new file mode 100644
index 0000000..9e7f688
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPrivate.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPrivateString.class b/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPrivateString.class
new file mode 100644
index 0000000..9352fd7
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPrivateString.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPublic.class b/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPublic.class
new file mode 100644
index 0000000..d78a2d0
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPublic.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPublicString.class b/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPublicString.class
new file mode 100644
index 0000000..8eec4e1
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor$InnerStaticPublicString.class differ
diff --git a/testData/classes/pkg/TestAnonymousClassConstructor.class b/testData/classes/pkg/TestAnonymousClassConstructor.class
new file mode 100644
index 0000000..7c692b8
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousClassConstructor.class differ
diff --git a/testData/classes/pkg/TestAnonymousParamNames$1.class b/testData/classes/pkg/TestAnonymousParamNames$1.class
new file mode 100644
index 0000000..3a8a43f
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousParamNames$1.class differ
diff --git a/testData/classes/pkg/TestAnonymousParamNames$Clazz.class b/testData/classes/pkg/TestAnonymousParamNames$Clazz.class
new file mode 100644
index 0000000..9e4c76a
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousParamNames$Clazz.class differ
diff --git a/testData/classes/pkg/TestAnonymousParamNames.class b/testData/classes/pkg/TestAnonymousParamNames.class
new file mode 100644
index 0000000..d8faae5
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousParamNames.class differ
diff --git a/testData/classes/pkg/TestAnonymousParams$1.class b/testData/classes/pkg/TestAnonymousParams$1.class
new file mode 100644
index 0000000..dccd219
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousParams$1.class differ
diff --git a/testData/classes/pkg/TestAnonymousParams.class b/testData/classes/pkg/TestAnonymousParams.class
new file mode 100644
index 0000000..0946b63
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousParams.class differ
diff --git a/testData/classes/pkg/TestAnonymousSignature$1.class b/testData/classes/pkg/TestAnonymousSignature$1.class
new file mode 100644
index 0000000..e60ba5d
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousSignature$1.class differ
diff --git a/testData/classes/pkg/TestAnonymousSignature$2.class b/testData/classes/pkg/TestAnonymousSignature$2.class
new file mode 100644
index 0000000..6865a49
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousSignature$2.class differ
diff --git a/testData/classes/pkg/TestAnonymousSignature.class b/testData/classes/pkg/TestAnonymousSignature.class
new file mode 100644
index 0000000..7fc0a45
Binary files /dev/null and b/testData/classes/pkg/TestAnonymousSignature.class differ
diff --git a/testData/classes/pkg/TestAsserts.class b/testData/classes/pkg/TestAsserts.class
new file mode 100644
index 0000000..1c42d7e
Binary files /dev/null and b/testData/classes/pkg/TestAsserts.class differ
diff --git a/testData/classes/pkg/TestClashName.class b/testData/classes/pkg/TestClashName.class
new file mode 100644
index 0000000..73b047d
Binary files /dev/null and b/testData/classes/pkg/TestClashName.class differ
diff --git a/testData/classes/pkg/TestClashNameIface.class b/testData/classes/pkg/TestClashNameIface.class
new file mode 100644
index 0000000..eeb153c
Binary files /dev/null and b/testData/classes/pkg/TestClashNameIface.class differ
diff --git a/testData/classes/pkg/TestClashNameParent.class b/testData/classes/pkg/TestClashNameParent.class
new file mode 100644
index 0000000..4c4119d
Binary files /dev/null and b/testData/classes/pkg/TestClashNameParent.class differ
diff --git a/testData/classes/pkg/TestClassFields$Inner.class b/testData/classes/pkg/TestClassFields$Inner.class
new file mode 100644
index 0000000..1c16a7e
Binary files /dev/null and b/testData/classes/pkg/TestClassFields$Inner.class differ
diff --git a/testData/classes/pkg/TestClassFields.class b/testData/classes/pkg/TestClassFields.class
index 603bab2..e8788e0 100644
Binary files a/testData/classes/pkg/TestClassFields.class and b/testData/classes/pkg/TestClassFields.class differ
diff --git a/testData/classes/pkg/TestConstructorReference.class b/testData/classes/pkg/TestConstructorReference.class
new file mode 100644
index 0000000..c5ba7df
Binary files /dev/null and b/testData/classes/pkg/TestConstructorReference.class differ
diff --git a/testData/classes/pkg/TestEmptyBlocks.class b/testData/classes/pkg/TestEmptyBlocks.class
new file mode 100644
index 0000000..2f7e391
Binary files /dev/null and b/testData/classes/pkg/TestEmptyBlocks.class differ
diff --git a/testData/classes/pkg/TestEnum$2.class b/testData/classes/pkg/TestEnum$2.class
index 99faf41..3dedba7 100644
Binary files a/testData/classes/pkg/TestEnum$2.class and b/testData/classes/pkg/TestEnum$2.class differ
diff --git a/testData/classes/pkg/TestEnum$Type.class b/testData/classes/pkg/TestEnum$Type.class
new file mode 100644
index 0000000..1e27737
Binary files /dev/null and b/testData/classes/pkg/TestEnum$Type.class differ
diff --git a/testData/classes/pkg/TestEnum.class b/testData/classes/pkg/TestEnum.class
index 01c6082..036f3e6 100644
Binary files a/testData/classes/pkg/TestEnum.class and b/testData/classes/pkg/TestEnum.class differ
diff --git a/testData/classes/pkg/TestExtendingSubclass$Subclass1.class b/testData/classes/pkg/TestExtendingSubclass$Subclass1.class
new file mode 100644
index 0000000..fbf2ce2
Binary files /dev/null and b/testData/classes/pkg/TestExtendingSubclass$Subclass1.class differ
diff --git a/testData/classes/pkg/TestExtendingSubclass$Subclass2.class b/testData/classes/pkg/TestExtendingSubclass$Subclass2.class
new file mode 100644
index 0000000..d30cc61
Binary files /dev/null and b/testData/classes/pkg/TestExtendingSubclass$Subclass2.class differ
diff --git a/testData/classes/pkg/TestExtendingSubclass.class b/testData/classes/pkg/TestExtendingSubclass.class
new file mode 100644
index 0000000..eb4f049
Binary files /dev/null and b/testData/classes/pkg/TestExtendingSubclass.class differ
diff --git a/testData/classes/pkg/TestFieldSingleAccess.class b/testData/classes/pkg/TestFieldSingleAccess.class
new file mode 100644
index 0000000..edc30ab
Binary files /dev/null and b/testData/classes/pkg/TestFieldSingleAccess.class differ
diff --git a/testData/classes/pkg/TestGenericArgs.class b/testData/classes/pkg/TestGenericArgs.class
new file mode 100644
index 0000000..6462ac0
Binary files /dev/null and b/testData/classes/pkg/TestGenericArgs.class differ
diff --git a/testData/classes/pkg/TestGroovyClass$Inner.class b/testData/classes/pkg/TestGroovyClass$Inner.class
new file mode 100644
index 0000000..51242d8
Binary files /dev/null and b/testData/classes/pkg/TestGroovyClass$Inner.class differ
diff --git a/testData/classes/pkg/TestGroovyClass$Nested.class b/testData/classes/pkg/TestGroovyClass$Nested.class
new file mode 100644
index 0000000..43d2e0e
Binary files /dev/null and b/testData/classes/pkg/TestGroovyClass$Nested.class differ
diff --git a/testData/classes/pkg/TestGroovyClass$_closure1.class b/testData/classes/pkg/TestGroovyClass$_closure1.class
new file mode 100644
index 0000000..61d5314
Binary files /dev/null and b/testData/classes/pkg/TestGroovyClass$_closure1.class differ
diff --git a/testData/classes/pkg/TestGroovyClass$_closure2.class b/testData/classes/pkg/TestGroovyClass$_closure2.class
new file mode 100644
index 0000000..50c203e
Binary files /dev/null and b/testData/classes/pkg/TestGroovyClass$_closure2.class differ
diff --git a/testData/classes/pkg/TestGroovyClass.class b/testData/classes/pkg/TestGroovyClass.class
new file mode 100644
index 0000000..de9df4b
Binary files /dev/null and b/testData/classes/pkg/TestGroovyClass.class differ
diff --git a/testData/classes/pkg/TestGroovyTrait$Trait$FieldHelper.class b/testData/classes/pkg/TestGroovyTrait$Trait$FieldHelper.class
new file mode 100644
index 0000000..ebf6bf5
Binary files /dev/null and b/testData/classes/pkg/TestGroovyTrait$Trait$FieldHelper.class differ
diff --git a/testData/classes/pkg/TestGroovyTrait$Trait$Helper.class b/testData/classes/pkg/TestGroovyTrait$Trait$Helper.class
new file mode 100644
index 0000000..e97d360
Binary files /dev/null and b/testData/classes/pkg/TestGroovyTrait$Trait$Helper.class differ
diff --git a/testData/classes/pkg/TestGroovyTrait.class b/testData/classes/pkg/TestGroovyTrait.class
new file mode 100644
index 0000000..561230c
Binary files /dev/null and b/testData/classes/pkg/TestGroovyTrait.class differ
diff --git a/testData/classes/pkg/TestIffSimplification.class b/testData/classes/pkg/TestIffSimplification.class
new file mode 100644
index 0000000..6dcb9b1
Binary files /dev/null and b/testData/classes/pkg/TestIffSimplification.class differ
diff --git a/testData/classes/pkg/TestIllegalVarName.class b/testData/classes/pkg/TestIllegalVarName.class
new file mode 100644
index 0000000..5fd5ec6
Binary files /dev/null and b/testData/classes/pkg/TestIllegalVarName.class differ
diff --git a/testData/classes/pkg/TestInUse.class b/testData/classes/pkg/TestInUse.class
new file mode 100644
index 0000000..5f0474f
Binary files /dev/null and b/testData/classes/pkg/TestInUse.class differ
diff --git a/testData/classes/pkg/TestInner2$1.class b/testData/classes/pkg/TestInner2$1.class
new file mode 100644
index 0000000..1f346fa
Binary files /dev/null and b/testData/classes/pkg/TestInner2$1.class differ
diff --git a/testData/classes/pkg/TestInner2$Another.class b/testData/classes/pkg/TestInner2$Another.class
new file mode 100644
index 0000000..bd04605
Binary files /dev/null and b/testData/classes/pkg/TestInner2$Another.class differ
diff --git a/testData/classes/pkg/TestInner2$Another2.class b/testData/classes/pkg/TestInner2$Another2.class
new file mode 100644
index 0000000..ff02baa
Binary files /dev/null and b/testData/classes/pkg/TestInner2$Another2.class differ
diff --git a/testData/classes/pkg/TestInner2$AnotherStatic.class b/testData/classes/pkg/TestInner2$AnotherStatic.class
new file mode 100644
index 0000000..1dec610
Binary files /dev/null and b/testData/classes/pkg/TestInner2$AnotherStatic.class differ
diff --git a/testData/classes/pkg/TestInner2$AnotherStatic2.class b/testData/classes/pkg/TestInner2$AnotherStatic2.class
new file mode 100644
index 0000000..3e4547a
Binary files /dev/null and b/testData/classes/pkg/TestInner2$AnotherStatic2.class differ
diff --git a/testData/classes/pkg/TestInner2.class b/testData/classes/pkg/TestInner2.class
new file mode 100644
index 0000000..6b45de1
Binary files /dev/null and b/testData/classes/pkg/TestInner2.class differ
diff --git a/testData/classes/pkg/TestInnerClassConstructor$1.class b/testData/classes/pkg/TestInnerClassConstructor$1.class
index 384ce5d..07172b9 100644
Binary files a/testData/classes/pkg/TestInnerClassConstructor$1.class and b/testData/classes/pkg/TestInnerClassConstructor$1.class differ
diff --git a/testData/classes/pkg/TestInnerClassConstructor$Another.class b/testData/classes/pkg/TestInnerClassConstructor$Another.class
new file mode 100644
index 0000000..5178a8f
Binary files /dev/null and b/testData/classes/pkg/TestInnerClassConstructor$Another.class differ
diff --git a/testData/classes/pkg/TestInnerClassConstructor$Inner.class b/testData/classes/pkg/TestInnerClassConstructor$Inner.class
index 37e9262..460cc7f 100644
Binary files a/testData/classes/pkg/TestInnerClassConstructor$Inner.class and b/testData/classes/pkg/TestInnerClassConstructor$Inner.class differ
diff --git a/testData/classes/pkg/TestInnerClassConstructor.class b/testData/classes/pkg/TestInnerClassConstructor.class
index fb0d898..6a48109 100644
Binary files a/testData/classes/pkg/TestInnerClassConstructor.class and b/testData/classes/pkg/TestInnerClassConstructor.class differ
diff --git a/testData/classes/pkg/TestInnerLocal$1Inner.class b/testData/classes/pkg/TestInnerLocal$1Inner.class
index 61aecb2..5169762 100644
Binary files a/testData/classes/pkg/TestInnerLocal$1Inner.class and b/testData/classes/pkg/TestInnerLocal$1Inner.class differ
diff --git a/testData/classes/pkg/TestInnerLocal$2Inner.class b/testData/classes/pkg/TestInnerLocal$2Inner.class
index 87289e1..9f50cad 100644
Binary files a/testData/classes/pkg/TestInnerLocal$2Inner.class and b/testData/classes/pkg/TestInnerLocal$2Inner.class differ
diff --git a/testData/classes/pkg/TestInnerLocal$Inner1.class b/testData/classes/pkg/TestInnerLocal$Inner1.class
index 145dc89..adf59a8 100644
Binary files a/testData/classes/pkg/TestInnerLocal$Inner1.class and b/testData/classes/pkg/TestInnerLocal$Inner1.class differ
diff --git a/testData/classes/pkg/TestInnerLocal$Inner1Static$Inner2Static.class b/testData/classes/pkg/TestInnerLocal$Inner1Static$Inner2Static.class
index b2262f5..cf258df 100644
Binary files a/testData/classes/pkg/TestInnerLocal$Inner1Static$Inner2Static.class and b/testData/classes/pkg/TestInnerLocal$Inner1Static$Inner2Static.class differ
diff --git a/testData/classes/pkg/TestInnerLocal$Inner1Static.class b/testData/classes/pkg/TestInnerLocal$Inner1Static.class
index f82d0ea..a244925 100644
Binary files a/testData/classes/pkg/TestInnerLocal$Inner1Static.class and b/testData/classes/pkg/TestInnerLocal$Inner1Static.class differ
diff --git a/testData/classes/pkg/TestInnerLocal.class b/testData/classes/pkg/TestInnerLocal.class
index cc89241..bd2bf75 100644
Binary files a/testData/classes/pkg/TestInnerLocal.class and b/testData/classes/pkg/TestInnerLocal.class differ
diff --git a/testData/classes/pkg/TestInnerLocalPkg$1Inner.class b/testData/classes/pkg/TestInnerLocalPkg$1Inner.class
deleted file mode 100644
index eedffa2..0000000
Binary files a/testData/classes/pkg/TestInnerLocalPkg$1Inner.class and /dev/null differ
diff --git a/testData/classes/pkg/TestInnerLocalPkg$2Inner.class b/testData/classes/pkg/TestInnerLocalPkg$2Inner.class
deleted file mode 100644
index 5a1dcc4..0000000
Binary files a/testData/classes/pkg/TestInnerLocalPkg$2Inner.class and /dev/null differ
diff --git a/testData/classes/pkg/TestInnerLocalPkg$Inner1.class b/testData/classes/pkg/TestInnerLocalPkg$Inner1.class
deleted file mode 100644
index 9d548f1..0000000
Binary files a/testData/classes/pkg/TestInnerLocalPkg$Inner1.class and /dev/null differ
diff --git a/testData/classes/pkg/TestInnerLocalPkg$Inner1Static$Inner2Static.class b/testData/classes/pkg/TestInnerLocalPkg$Inner1Static$Inner2Static.class
deleted file mode 100644
index 54d59e3..0000000
Binary files a/testData/classes/pkg/TestInnerLocalPkg$Inner1Static$Inner2Static.class and /dev/null differ
diff --git a/testData/classes/pkg/TestInnerLocalPkg$Inner1Static.class b/testData/classes/pkg/TestInnerLocalPkg$Inner1Static.class
deleted file mode 100644
index 262b686..0000000
Binary files a/testData/classes/pkg/TestInnerLocalPkg$Inner1Static.class and /dev/null differ
diff --git a/testData/classes/pkg/TestInnerLocalPkg.class b/testData/classes/pkg/TestInnerLocalPkg.class
deleted file mode 100644
index 7535849..0000000
Binary files a/testData/classes/pkg/TestInnerLocalPkg.class and /dev/null differ
diff --git a/testData/classes/pkg/TestInnerSignature$Inner.class b/testData/classes/pkg/TestInnerSignature$Inner.class
index d335f61..3303ccb 100644
Binary files a/testData/classes/pkg/TestInnerSignature$Inner.class and b/testData/classes/pkg/TestInnerSignature$Inner.class differ
diff --git a/testData/classes/pkg/TestInnerSignature$InnerStatic.class b/testData/classes/pkg/TestInnerSignature$InnerStatic.class
index 2bd775b..7d51b40 100644
Binary files a/testData/classes/pkg/TestInnerSignature$InnerStatic.class and b/testData/classes/pkg/TestInnerSignature$InnerStatic.class differ
diff --git a/testData/classes/pkg/TestInnerSignature.class b/testData/classes/pkg/TestInnerSignature.class
index e2f9489..18b96ef 100644
Binary files a/testData/classes/pkg/TestInnerSignature.class and b/testData/classes/pkg/TestInnerSignature.class differ
diff --git a/testData/classes/pkg/TestInterfaceFields.class b/testData/classes/pkg/TestInterfaceFields.class
new file mode 100644
index 0000000..4f39e33
Binary files /dev/null and b/testData/classes/pkg/TestInterfaceFields.class differ
diff --git a/testData/classes/pkg/TestInterfaceMethods.class b/testData/classes/pkg/TestInterfaceMethods.class
new file mode 100644
index 0000000..1cc7d69
Binary files /dev/null and b/testData/classes/pkg/TestInterfaceMethods.class differ
diff --git a/testData/classes/pkg/TestInterfaceSuper$Impl.class b/testData/classes/pkg/TestInterfaceSuper$Impl.class
new file mode 100644
index 0000000..c9be440
Binary files /dev/null and b/testData/classes/pkg/TestInterfaceSuper$Impl.class differ
diff --git a/testData/classes/pkg/TestInterfaceSuper.class b/testData/classes/pkg/TestInterfaceSuper.class
new file mode 100644
index 0000000..1c4504a
Binary files /dev/null and b/testData/classes/pkg/TestInterfaceSuper.class differ
diff --git a/testData/classes/pkg/TestKotlinConstructorKt.class b/testData/classes/pkg/TestKotlinConstructorKt.class
new file mode 100644
index 0000000..28766dd
Binary files /dev/null and b/testData/classes/pkg/TestKotlinConstructorKt.class differ
diff --git a/testData/classes/pkg/TestLambdaParams.class b/testData/classes/pkg/TestLambdaParams.class
new file mode 100644
index 0000000..8989c66
Binary files /dev/null and b/testData/classes/pkg/TestLambdaParams.class differ
diff --git a/testData/classes/pkg/TestLineNumbersMatch.class b/testData/classes/pkg/TestLineNumbersMatch.class
deleted file mode 100644
index 0a96fbb..0000000
Binary files a/testData/classes/pkg/TestLineNumbersMatch.class and /dev/null differ
diff --git a/testData/classes/pkg/TestLocalsNames.class b/testData/classes/pkg/TestLocalsNames.class
new file mode 100644
index 0000000..f24049e
Binary files /dev/null and b/testData/classes/pkg/TestLocalsNames.class differ
diff --git a/testData/classes/pkg/TestLocalsSignature.class b/testData/classes/pkg/TestLocalsSignature.class
new file mode 100644
index 0000000..8f6b2fb
Binary files /dev/null and b/testData/classes/pkg/TestLocalsSignature.class differ
diff --git a/testData/classes/pkg/TestMemberAnnotations$A.class b/testData/classes/pkg/TestMemberAnnotations$A.class
new file mode 100644
index 0000000..f7fa790
Binary files /dev/null and b/testData/classes/pkg/TestMemberAnnotations$A.class differ
diff --git a/testData/classes/pkg/TestMemberAnnotations.class b/testData/classes/pkg/TestMemberAnnotations.class
new file mode 100644
index 0000000..cb09ec4
Binary files /dev/null and b/testData/classes/pkg/TestMemberAnnotations.class differ
diff --git a/testData/classes/pkg/TestMethodParametersAttr$1Local.class b/testData/classes/pkg/TestMethodParametersAttr$1Local.class
new file mode 100644
index 0000000..8cfb527
Binary files /dev/null and b/testData/classes/pkg/TestMethodParametersAttr$1Local.class differ
diff --git a/testData/classes/pkg/TestMethodParametersAttr$C1.class b/testData/classes/pkg/TestMethodParametersAttr$C1.class
new file mode 100644
index 0000000..9acce02
Binary files /dev/null and b/testData/classes/pkg/TestMethodParametersAttr$C1.class differ
diff --git a/testData/classes/pkg/TestMethodParametersAttr$C2.class b/testData/classes/pkg/TestMethodParametersAttr$C2.class
new file mode 100644
index 0000000..6ecf7d0
Binary files /dev/null and b/testData/classes/pkg/TestMethodParametersAttr$C2.class differ
diff --git a/testData/classes/pkg/TestMethodParametersAttr$C3.class b/testData/classes/pkg/TestMethodParametersAttr$C3.class
new file mode 100644
index 0000000..698cd06
Binary files /dev/null and b/testData/classes/pkg/TestMethodParametersAttr$C3.class differ
diff --git a/testData/classes/pkg/TestMethodParametersAttr$C4.class b/testData/classes/pkg/TestMethodParametersAttr$C4.class
new file mode 100644
index 0000000..6259a0e
Binary files /dev/null and b/testData/classes/pkg/TestMethodParametersAttr$C4.class differ
diff --git a/testData/classes/pkg/TestMethodParametersAttr$I1.class b/testData/classes/pkg/TestMethodParametersAttr$I1.class
new file mode 100644
index 0000000..6b52d99
Binary files /dev/null and b/testData/classes/pkg/TestMethodParametersAttr$I1.class differ
diff --git a/testData/classes/pkg/TestMethodParametersAttr.class b/testData/classes/pkg/TestMethodParametersAttr.class
new file mode 100644
index 0000000..3549300
Binary files /dev/null and b/testData/classes/pkg/TestMethodParametersAttr.class differ
diff --git a/testData/classes/pkg/TestMethodReferenceLetterClass.class b/testData/classes/pkg/TestMethodReferenceLetterClass.class
new file mode 100644
index 0000000..74bb32d
Binary files /dev/null and b/testData/classes/pkg/TestMethodReferenceLetterClass.class differ
diff --git a/testData/classes/pkg/TestMethodReferenceSameName$R1.class b/testData/classes/pkg/TestMethodReferenceSameName$R1.class
new file mode 100644
index 0000000..895110b
Binary files /dev/null and b/testData/classes/pkg/TestMethodReferenceSameName$R1.class differ
diff --git a/testData/classes/pkg/TestMethodReferenceSameName.class b/testData/classes/pkg/TestMethodReferenceSameName.class
new file mode 100644
index 0000000..600e551
Binary files /dev/null and b/testData/classes/pkg/TestMethodReferenceSameName.class differ
diff --git a/testData/classes/pkg/TestMissingConstructorCallBad.class b/testData/classes/pkg/TestMissingConstructorCallBad.class
new file mode 100644
index 0000000..4c73fb1
Binary files /dev/null and b/testData/classes/pkg/TestMissingConstructorCallBad.class differ
diff --git a/testData/classes/pkg/TestMissingConstructorCallGood.class b/testData/classes/pkg/TestMissingConstructorCallGood.class
new file mode 100644
index 0000000..564f9b4
Binary files /dev/null and b/testData/classes/pkg/TestMissingConstructorCallGood.class differ
diff --git a/testData/classes/pkg/TestNamedSuspendFun2Kt$foo2$1.class b/testData/classes/pkg/TestNamedSuspendFun2Kt$foo2$1.class
new file mode 100644
index 0000000..af894aa
Binary files /dev/null and b/testData/classes/pkg/TestNamedSuspendFun2Kt$foo2$1.class differ
diff --git a/testData/classes/pkg/TestNamedSuspendFun2Kt.class b/testData/classes/pkg/TestNamedSuspendFun2Kt.class
new file mode 100644
index 0000000..83f3b75
Binary files /dev/null and b/testData/classes/pkg/TestNamedSuspendFun2Kt.class differ
diff --git a/testData/classes/pkg/TestParameterizedTypes$Inner.class b/testData/classes/pkg/TestParameterizedTypes$Inner.class
new file mode 100644
index 0000000..55f1d4c
Binary files /dev/null and b/testData/classes/pkg/TestParameterizedTypes$Inner.class differ
diff --git a/testData/classes/pkg/TestParameterizedTypes.class b/testData/classes/pkg/TestParameterizedTypes.class
new file mode 100644
index 0000000..0c61819
Binary files /dev/null and b/testData/classes/pkg/TestParameterizedTypes.class differ
diff --git a/testData/classes/pkg/TestPop2OneDoublePop2.class b/testData/classes/pkg/TestPop2OneDoublePop2.class
new file mode 100644
index 0000000..1c41f76
Binary files /dev/null and b/testData/classes/pkg/TestPop2OneDoublePop2.class differ
diff --git a/testData/classes/pkg/TestPop2OneLongPop2.class b/testData/classes/pkg/TestPop2OneLongPop2.class
new file mode 100644
index 0000000..d19cfde
Binary files /dev/null and b/testData/classes/pkg/TestPop2OneLongPop2.class differ
diff --git a/testData/classes/pkg/TestPop2TwoIntPop2.class b/testData/classes/pkg/TestPop2TwoIntPop2.class
new file mode 100644
index 0000000..f227a65
Binary files /dev/null and b/testData/classes/pkg/TestPop2TwoIntPop2.class differ
diff --git a/testData/classes/pkg/TestPop2TwoIntTwoPop.class b/testData/classes/pkg/TestPop2TwoIntTwoPop.class
new file mode 100644
index 0000000..419a512
Binary files /dev/null and b/testData/classes/pkg/TestPop2TwoIntTwoPop.class differ
diff --git a/testData/classes/pkg/TestPrimitiveNarrowing.class b/testData/classes/pkg/TestPrimitiveNarrowing.class
new file mode 100644
index 0000000..dc7c0c5
Binary files /dev/null and b/testData/classes/pkg/TestPrimitiveNarrowing.class differ
diff --git a/testData/classes/pkg/TestPrimitives.class b/testData/classes/pkg/TestPrimitives.class
new file mode 100644
index 0000000..9c52484
Binary files /dev/null and b/testData/classes/pkg/TestPrimitives.class differ
diff --git a/testData/classes/pkg/TestPrivateEmptyConstructor.class b/testData/classes/pkg/TestPrivateEmptyConstructor.class
new file mode 100644
index 0000000..a8aa7e0
Binary files /dev/null and b/testData/classes/pkg/TestPrivateEmptyConstructor.class differ
diff --git a/testData/classes/pkg/TestShadowing.class b/testData/classes/pkg/TestShadowing.class
new file mode 100644
index 0000000..caca600
Binary files /dev/null and b/testData/classes/pkg/TestShadowing.class differ
diff --git a/testData/classes/pkg/TestShadowingSuperClass$Builder.class b/testData/classes/pkg/TestShadowingSuperClass$Builder.class
new file mode 100644
index 0000000..ec4d6ad
Binary files /dev/null and b/testData/classes/pkg/TestShadowingSuperClass$Builder.class differ
diff --git a/testData/classes/pkg/TestShadowingSuperClass.class b/testData/classes/pkg/TestShadowingSuperClass.class
new file mode 100644
index 0000000..e489b60
Binary files /dev/null and b/testData/classes/pkg/TestShadowingSuperClass.class differ
diff --git a/testData/classes/pkg/TestStaticNameClash.class b/testData/classes/pkg/TestStaticNameClash.class
new file mode 100644
index 0000000..7ae890e
Binary files /dev/null and b/testData/classes/pkg/TestStaticNameClash.class differ
diff --git a/testData/classes/pkg/TestStringConcat.class b/testData/classes/pkg/TestStringConcat.class
new file mode 100644
index 0000000..0292073
Binary files /dev/null and b/testData/classes/pkg/TestStringConcat.class differ
diff --git a/testData/classes/pkg/TestStringLiterals.class b/testData/classes/pkg/TestStringLiterals.class
new file mode 100644
index 0000000..f4cb2b9
Binary files /dev/null and b/testData/classes/pkg/TestStringLiterals.class differ
diff --git a/testData/classes/pkg/TestSuperInner$Inner2.class b/testData/classes/pkg/TestSuperInner$Inner2.class
new file mode 100644
index 0000000..b7b9df5
Binary files /dev/null and b/testData/classes/pkg/TestSuperInner$Inner2.class differ
diff --git a/testData/classes/pkg/TestSuperInner.class b/testData/classes/pkg/TestSuperInner.class
new file mode 100644
index 0000000..0629d9c
Binary files /dev/null and b/testData/classes/pkg/TestSuperInner.class differ
diff --git a/testData/classes/pkg/TestSuperInnerBase$Inner.class b/testData/classes/pkg/TestSuperInnerBase$Inner.class
new file mode 100644
index 0000000..bb6539f
Binary files /dev/null and b/testData/classes/pkg/TestSuperInnerBase$Inner.class differ
diff --git a/testData/classes/pkg/TestSuperInnerBase.class b/testData/classes/pkg/TestSuperInnerBase.class
new file mode 100644
index 0000000..2295e71
Binary files /dev/null and b/testData/classes/pkg/TestSuperInnerBase.class differ
diff --git a/testData/classes/pkg/TestSuspendLambdaKt$sl1$1.class b/testData/classes/pkg/TestSuspendLambdaKt$sl1$1.class
new file mode 100644
index 0000000..47b0abe
Binary files /dev/null and b/testData/classes/pkg/TestSuspendLambdaKt$sl1$1.class differ
diff --git a/testData/classes/pkg/TestSuspendLambdaKt.class b/testData/classes/pkg/TestSuspendLambdaKt.class
new file mode 100644
index 0000000..37db783
Binary files /dev/null and b/testData/classes/pkg/TestSuspendLambdaKt.class differ
diff --git a/testData/classes/pkg/TestSwitchOnEnum$1.class b/testData/classes/pkg/TestSwitchOnEnum$1.class
new file mode 100644
index 0000000..6c54901
Binary files /dev/null and b/testData/classes/pkg/TestSwitchOnEnum$1.class differ
diff --git a/testData/classes/pkg/TestSwitchOnEnum$Example$A.class b/testData/classes/pkg/TestSwitchOnEnum$Example$A.class
new file mode 100644
index 0000000..7bd4f3d
Binary files /dev/null and b/testData/classes/pkg/TestSwitchOnEnum$Example$A.class differ
diff --git a/testData/classes/pkg/TestSwitchOnEnum$Example$B.class b/testData/classes/pkg/TestSwitchOnEnum$Example$B.class
new file mode 100644
index 0000000..ab8f77d
Binary files /dev/null and b/testData/classes/pkg/TestSwitchOnEnum$Example$B.class differ
diff --git a/testData/classes/pkg/TestSwitchOnEnum$Example.class b/testData/classes/pkg/TestSwitchOnEnum$Example.class
new file mode 100644
index 0000000..dbcba7e
Binary files /dev/null and b/testData/classes/pkg/TestSwitchOnEnum$Example.class differ
diff --git a/testData/classes/pkg/TestSwitchOnEnum.class b/testData/classes/pkg/TestSwitchOnEnum.class
new file mode 100644
index 0000000..f7c13a2
Binary files /dev/null and b/testData/classes/pkg/TestSwitchOnEnum.class differ
diff --git a/testData/classes/pkg/TestSwitchOnStrings.class b/testData/classes/pkg/TestSwitchOnStrings.class
new file mode 100644
index 0000000..cd0e56e
Binary files /dev/null and b/testData/classes/pkg/TestSwitchOnStrings.class differ
diff --git a/testData/classes/pkg/TestSynchronizedUnprotected.class b/testData/classes/pkg/TestSynchronizedUnprotected.class
new file mode 100644
index 0000000..e5cc393
Binary files /dev/null and b/testData/classes/pkg/TestSynchronizedUnprotected.class differ
diff --git a/testData/classes/pkg/TestSyntheticAccess$Assigner.class b/testData/classes/pkg/TestSyntheticAccess$Assigner.class
new file mode 100644
index 0000000..a089dba
Binary files /dev/null and b/testData/classes/pkg/TestSyntheticAccess$Assigner.class differ
diff --git a/testData/classes/pkg/TestSyntheticAccess$Incrementer.class b/testData/classes/pkg/TestSyntheticAccess$Incrementer.class
new file mode 100644
index 0000000..d592c34
Binary files /dev/null and b/testData/classes/pkg/TestSyntheticAccess$Incrementer.class differ
diff --git a/testData/classes/pkg/TestSyntheticAccess.class b/testData/classes/pkg/TestSyntheticAccess.class
new file mode 100644
index 0000000..9e3f5eb
Binary files /dev/null and b/testData/classes/pkg/TestSyntheticAccess.class differ
diff --git a/testData/classes/pkg/TestUnionType.class b/testData/classes/pkg/TestUnionType.class
new file mode 100644
index 0000000..b299158
Binary files /dev/null and b/testData/classes/pkg/TestUnionType.class differ
diff --git a/testData/classes/pkg/TestVarArgCalls.class b/testData/classes/pkg/TestVarArgCalls.class
new file mode 100644
index 0000000..ac83648
Binary files /dev/null and b/testData/classes/pkg/TestVarArgCalls.class differ
diff --git a/testData/classes/pkg/TypeAnnotations$MixA.class b/testData/classes/pkg/TypeAnnotations$MixA.class
new file mode 100644
index 0000000..2795bce
Binary files /dev/null and b/testData/classes/pkg/TypeAnnotations$MixA.class differ
diff --git a/testData/classes/pkg/TypeAnnotations$TA.class b/testData/classes/pkg/TypeAnnotations$TA.class
new file mode 100644
index 0000000..d02171e
Binary files /dev/null and b/testData/classes/pkg/TypeAnnotations$TA.class differ
diff --git a/testData/classes/pkg/TypeAnnotations.class b/testData/classes/pkg/TypeAnnotations.class
new file mode 100644
index 0000000..0e8e34a
Binary files /dev/null and b/testData/classes/pkg/TypeAnnotations.class differ
diff --git a/testData/classes/pkg/package-info.class b/testData/classes/pkg/package-info.class
new file mode 100644
index 0000000..eee2939
Binary files /dev/null and b/testData/classes/pkg/package-info.class differ
diff --git a/testData/classes/v11/TestInnerClassConstructor$1.class b/testData/classes/v11/TestInnerClassConstructor$1.class
index b11a30e..fad6e4e 100644
Binary files a/testData/classes/v11/TestInnerClassConstructor$1.class and b/testData/classes/v11/TestInnerClassConstructor$1.class differ
diff --git a/testData/classes/v11/TestInnerClassConstructor$Another.class b/testData/classes/v11/TestInnerClassConstructor$Another.class
new file mode 100644
index 0000000..61d71db
Binary files /dev/null and b/testData/classes/v11/TestInnerClassConstructor$Another.class differ
diff --git a/testData/classes/v11/TestInnerClassConstructor$Inner.class b/testData/classes/v11/TestInnerClassConstructor$Inner.class
index 81face1..906b571 100644
Binary files a/testData/classes/v11/TestInnerClassConstructor$Inner.class and b/testData/classes/v11/TestInnerClassConstructor$Inner.class differ
diff --git a/testData/classes/v11/TestInnerClassConstructor.class b/testData/classes/v11/TestInnerClassConstructor.class
index 9cbad7f..b203edf 100644
Binary files a/testData/classes/v11/TestInnerClassConstructor.class and b/testData/classes/v11/TestInnerClassConstructor.class differ
diff --git a/testData/obfuscated.jar b/testData/obfuscated.jar
new file mode 100644
index 0000000..df97fb5
Binary files /dev/null and b/testData/obfuscated.jar differ
diff --git a/testData/obfuscated/a.java b/testData/obfuscated/a.java
new file mode 100644
index 0000000..c075f89
--- /dev/null
+++ b/testData/obfuscated/a.java
@@ -0,0 +1,39 @@
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+public interface a<K, V> {
+   String a();
+
+   int b();
+
+   int c();
+
+   long d();
+
+   List<Long> e();
+
+   Long f();
+
+   List<Long> g();
+
+   Date h();
+
+   void i();
+
+   void j();
+
+   V a(K var1);
+
+   V a(K var1, f<K, V> var2);
+
+   void a(K var1, V var2);
+
+   void b(K var1);
+
+   boolean c(K var1);
+
+   Iterator<K> k();
+
+   List<b<K, V>> l();
+}
diff --git a/testData/obfuscated/a0.java b/testData/obfuscated/a0.java
new file mode 100644
index 0000000..591434a
--- /dev/null
+++ b/testData/obfuscated/a0.java
@@ -0,0 +1,18 @@
+import java.util.List;
+import javax.xml.xpath.XPathExpressionException;
+
+public interface a0 {
+   a0 a(String var1) throws XPathExpressionException;
+
+   List<a0> b(String var1) throws XPathExpressionException;
+
+   a0[] c(String var1) throws XPathExpressionException;
+
+   String d(String var1) throws XPathExpressionException;
+
+   o e(String var1) throws XPathExpressionException;
+
+   boolean f(String var1) throws XPathExpressionException;
+
+   String a();
+}
diff --git a/testData/obfuscated/a1.java b/testData/obfuscated/a1.java
new file mode 100644
index 0000000..5d4c8a4
--- /dev/null
+++ b/testData/obfuscated/a1.java
@@ -0,0 +1,91 @@
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+public class a1 implements a0 {
+   private Node a;
+   private static final XPathFactory b = XPathFactory.newInstance();
+
+   public a1(Node var1) {
+      this.a = var1;
+   }
+
+   public a0 a(String var1) throws XPathExpressionException {
+      Node var2 = (Node)b.newXPath().compile(var1).evaluate(this.a, XPathConstants.NODE);
+
+      try {
+         if (var2 == null) {
+            return null;
+         }
+      } catch (XPathExpressionException var3) {
+         throw var3;
+      }
+
+      return new a1(var2);
+   }
+
+   public List<a0> b(String var1) throws XPathExpressionException {
+      int var5 = bc.e;
+      NodeList var2 = (NodeList)b.newXPath().compile(var1).evaluate(this.a, XPathConstants.NODESET);
+      ArrayList var3 = new ArrayList(var2.getLength());
+      int var4 = 0;
+
+      ArrayList var10000;
+      while(true) {
+         if (var4 < var2.getLength()) {
+            try {
+               var10000 = var3;
+               if (var5 != 0) {
+                  break;
+               }
+
+               var3.add(new a1(var2.item(var4)));
+               ++var4;
+               if (var5 == 0) {
+                  continue;
+               }
+            } catch (XPathExpressionException var7) {
+               throw var7;
+            }
+
+            int var6 = ap.c;
+            ++var6;
+            ap.c = var6;
+         }
+
+         var10000 = var3;
+         break;
+      }
+
+      return var10000;
+   }
+
+   public a0[] c(String var1) throws XPathExpressionException {
+      List var2 = this.b(var1);
+      return (a0[])var2.toArray(new a0[var2.size()]);
+   }
+
+   public String d(String param1) throws XPathExpressionException {
+      // $FF: Couldn't be decompiled
+   }
+
+   public boolean f(String param1) throws XPathExpressionException {
+      // $FF: Couldn't be decompiled
+   }
+
+   public String a() {
+      return this.a.getNodeName();
+   }
+
+   public String toString() {
+      return this.a();
+   }
+
+   public o e(String var1) throws XPathExpressionException {
+      return o.b((Object)this.d(var1));
+   }
+}
diff --git a/testData/obfuscated/a2.java b/testData/obfuscated/a2.java
new file mode 100644
index 0000000..343fa6a
--- /dev/null
+++ b/testData/obfuscated/a2.java
@@ -0,0 +1,93 @@
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+class a2 implements EntityResolver {
+   final bc a;
+   private static final String b;
+
+   a2(bc var1) {
+      this.a = var1;
+   }
+
+   public InputSource resolveEntity(String var1, String var2) throws SAXException, IOException {
+      URL var3 = new URL(var2);
+      if (b.equals(var3.getProtocol())) {
+         File var4 = new File(var3.getFile());
+
+         try {
+            if (var4.exists()) {
+               return new InputSource(new FileInputStream(var4));
+            }
+         } catch (SAXException var5) {
+            throw var5;
+         }
+      }
+
+      return null;
+   }
+
+   static {
+      char[] var10000 = "\u001d2\u00049".toCharArray();
+      int var10002 = var10000.length;
+      int var1 = 0;
+      char[] var10001 = var10000;
+      int var2 = var10002;
+      int var10003;
+      char[] var4;
+      if (var10002 <= 1) {
+         var4 = var10000;
+         var10003 = var1;
+      } else {
+         var10001 = var10000;
+         var2 = var10002;
+         if (var10002 <= var1) {
+            b = (new String(var10000)).intern();
+            return;
+         }
+
+         var4 = var10000;
+         var10003 = var1;
+      }
+
+      while(true) {
+         char var10004 = var4[var10003];
+         byte var10005;
+         switch(var1 % 5) {
+         case 0:
+            var10005 = 123;
+            break;
+         case 1:
+            var10005 = 91;
+            break;
+         case 2:
+            var10005 = 104;
+            break;
+         case 3:
+            var10005 = 92;
+            break;
+         default:
+            var10005 = 15;
+         }
+
+         var4[var10003] = (char)(var10004 ^ var10005);
+         ++var1;
+         if (var2 == 0) {
+            var10003 = var2;
+            var4 = var10001;
+         } else {
+            if (var2 <= var1) {
+               b = (new String(var10001)).intern();
+               return;
+            }
+
+            var4 = var10001;
+            var10003 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/a3.java b/testData/obfuscated/a3.java
new file mode 100644
index 0000000..8bd1e44
--- /dev/null
+++ b/testData/obfuscated/a3.java
@@ -0,0 +1,2068 @@
+import java.util.concurrent.TimeUnit;
+
+public class a3 {
+   private static final a<Integer, Integer> a;
+   private static final String[] b;
+
+   private static int a(int param0, boolean param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public static void main(String[] var0) throws Exception {
+      boolean var2 = a7.b;
+      ax var1 = ax.a();
+      System.out.println(b[4]);
+      a(42, false);
+      System.out.println(var1.e());
+      System.out.println(b[5]);
+      a(42, true);
+      System.out.println(var1.e());
+      a();
+      System.out.println(b[6]);
+      Thread.sleep(5000L);
+      System.out.println(b[3]);
+      d.b();
+      a();
+      if (var2) {
+         int var3 = ap.c;
+         ++var3;
+         ap.c = var3;
+      }
+
+   }
+
+   private static void a() {
+      System.out.println(b[1] + a.c());
+      System.out.println(b[0] + a.d());
+      System.out.println(b[2] + a.f());
+   }
+
+   static {
+      int var1;
+      int var6;
+      char[] var8;
+      String[] var10000;
+      char[] var10003;
+      char[] var10004;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label697: {
+         var10000 = new String[7];
+         var10003 = "`eA\u0006\u0003\u0015".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var6 = var10005;
+         if (var10005 <= 1) {
+            var8 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var6 = var10005;
+            if (var10005 <= var1) {
+               break label697;
+            }
+
+            var8 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var8[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 53;
+               break;
+            case 1:
+               var10008 = 22;
+               break;
+            case 2:
+               var10008 = 36;
+               break;
+            case 3:
+               var10008 = 117;
+               break;
+            default:
+               var10008 = 57;
+            }
+
+            var8[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var6 == 0) {
+               var10006 = var6;
+               var8 = var10004;
+            } else {
+               if (var6 <= var1) {
+                  break;
+               }
+
+               var8 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "f\u007f^\u0010\u0003\u0015".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var6 = var10005;
+      char[] var2;
+      int var3;
+      char[] var5;
+      char var9;
+      byte var10;
+      char[] var10001;
+      int var10002;
+      if (var10005 <= 1) {
+         var8 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 53;
+            break;
+         case 1:
+            var10008 = 22;
+            break;
+         case 2:
+            var10008 = 36;
+            break;
+         case 3:
+            var10008 = 117;
+            break;
+         default:
+            var10008 = 57;
+         }
+      } else {
+         var10004 = var10003;
+         var6 = var10005;
+         if (var10005 <= var1) {
+            label740: {
+               var10000[1] = (new String(var10003)).intern();
+               var10003 = "}\u007fPXkTbAO\u0019".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var6 = var10005;
+               if (var10005 <= 1) {
+                  var8 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var6 = var10005;
+                  if (var10005 <= var1) {
+                     break label740;
+                  }
+
+                  var8 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var8[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 53;
+                     break;
+                  case 1:
+                     var10008 = 22;
+                     break;
+                  case 2:
+                     var10008 = 36;
+                     break;
+                  case 3:
+                     var10008 = 117;
+                     break;
+                  default:
+                     var10008 = 57;
+                  }
+
+                  var8[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var6 == 0) {
+                     var10006 = var6;
+                     var8 = var10004;
+                  } else {
+                     if (var6 <= var1) {
+                        break;
+                     }
+
+                     var8 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[2] = (new String(var10004)).intern();
+            var10003 = "gcJ\u001bP[q\u0004\u0016XV~AX\\C\u007fG\u0001PZx\n[\u0017".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var6 = var10005;
+            if (var10005 <= 1) {
+               var8 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 53;
+                  break;
+               case 1:
+                  var10008 = 22;
+                  break;
+               case 2:
+                  var10008 = 36;
+                  break;
+               case 3:
+                  var10008 = 117;
+                  break;
+               default:
+                  var10008 = 57;
+               }
+            } else {
+               var10004 = var10003;
+               var6 = var10005;
+               if (var10005 <= var1) {
+                  label808: {
+                     var10000[3] = (new String(var10003)).intern();
+                     var10003 = "S\u007fF]\r\u0007?\u0004\u0002PA~K\u0000M\u0015uE\u0016QP,".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var6 = var10005;
+                     if (var10005 <= 1) {
+                        var8 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= var1) {
+                           break label808;
+                        }
+
+                        var8 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var8[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 53;
+                           break;
+                        case 1:
+                           var10008 = 22;
+                           break;
+                        case 2:
+                           var10008 = 36;
+                           break;
+                        case 3:
+                           var10008 = 117;
+                           break;
+                        default:
+                           var10008 = 57;
+                        }
+
+                        var8[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var6 == 0) {
+                           var10006 = var6;
+                           var8 = var10004;
+                        } else {
+                           if (var6 <= var1) {
+                              break;
+                           }
+
+                           var8 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[4] = (new String(var10004)).intern();
+                  var10003 = "S\u007fF]\r\u0007?\u0004\u0002PA~\u0004\u0016XV~AO".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var6 = var10005;
+                  if (var10005 <= 1) {
+                     var8 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 53;
+                        break;
+                     case 1:
+                        var10008 = 22;
+                        break;
+                     case 2:
+                        var10008 = 36;
+                        break;
+                     case 3:
+                        var10008 = 117;
+                        break;
+                     default:
+                        var10008 = 57;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var6 = var10005;
+                     if (var10005 <= var1) {
+                        label876: {
+                           var10000[5] = (new String(var10003)).intern();
+                           var10003 = "bwM\u0001P[q\u0004@\u0019FsG\u001aWQe\u0004\u0001V\u0015zA\u0001\u0019ZcVU\\[bV\u001c\\F6A\rI\\dA[\u0017\u001b".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= 1) {
+                              var8 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= var1) {
+                                 break label876;
+                              }
+
+                              var8 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var8[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 53;
+                                 break;
+                              case 1:
+                                 var10008 = 22;
+                                 break;
+                              case 2:
+                                 var10008 = 36;
+                                 break;
+                              case 3:
+                                 var10008 = 117;
+                                 break;
+                              default:
+                                 var10008 = 57;
+                              }
+
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                              } else {
+                                 if (var6 <= var1) {
+                                    break;
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[6] = (new String(var10004)).intern();
+                        b = var10000;
+                        var2 = "s\u007fF\u001aWTuG\u001c".toCharArray();
+                        var10002 = var2.length;
+                        var1 = 0;
+                        var10001 = var2;
+                        var3 = var10002;
+                        if (var10002 <= 1) {
+                           var5 = var2;
+                           var6 = var1;
+                        } else {
+                           var10001 = var2;
+                           var3 = var10002;
+                           if (var10002 <= var1) {
+                              a = d.a((new String(var2)).intern(), 10, 2L, TimeUnit.SECONDS);
+                              return;
+                           }
+
+                           var5 = var2;
+                           var6 = var1;
+                        }
+
+                        while(true) {
+                           var9 = var5[var6];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10 = 53;
+                              break;
+                           case 1:
+                              var10 = 22;
+                              break;
+                           case 2:
+                              var10 = 36;
+                              break;
+                           case 3:
+                              var10 = 117;
+                              break;
+                           default:
+                              var10 = 57;
+                           }
+
+                           var5[var6] = (char)(var9 ^ var10);
+                           ++var1;
+                           if (var3 == 0) {
+                              var6 = var3;
+                              var5 = var10001;
+                           } else {
+                              if (var3 <= var1) {
+                                 a = d.a((new String(var10001)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                 return;
+                              }
+
+                              var5 = var10001;
+                              var6 = var1;
+                           }
+                        }
+                     }
+
+                     var8 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 53;
+                        break;
+                     case 1:
+                        var10008 = 22;
+                        break;
+                     case 2:
+                        var10008 = 36;
+                        break;
+                     case 3:
+                        var10008 = 117;
+                        break;
+                     default:
+                        var10008 = 57;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var8[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var6 == 0) {
+                           var10006 = var6;
+                           var8 = var10004;
+                           var10007 = var10004[var6];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 53;
+                              break;
+                           case 1:
+                              var10008 = 22;
+                              break;
+                           case 2:
+                              var10008 = 36;
+                              break;
+                           case 3:
+                              var10008 = 117;
+                              break;
+                           default:
+                              var10008 = 57;
+                           }
+                        } else {
+                           if (var6 <= var1) {
+                              label984: {
+                                 var10000[5] = (new String(var10004)).intern();
+                                 var10003 = "bwM\u0001P[q\u0004@\u0019FsG\u001aWQe\u0004\u0001V\u0015zA\u0001\u0019ZcVU\\[bV\u001c\\F6A\rI\\dA[\u0017\u001b".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label984;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 53;
+                                       break;
+                                    case 1:
+                                       var10008 = 22;
+                                       break;
+                                    case 2:
+                                       var10008 = 36;
+                                       break;
+                                    case 3:
+                                       var10008 = 117;
+                                       break;
+                                    default:
+                                       var10008 = 57;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[6] = (new String(var10004)).intern();
+                              b = var10000;
+                              var2 = "s\u007fF\u001aWTuG\u001c".toCharArray();
+                              var10002 = var2.length;
+                              var1 = 0;
+                              var10001 = var2;
+                              var3 = var10002;
+                              if (var10002 <= 1) {
+                                 var5 = var2;
+                                 var6 = var1;
+                              } else {
+                                 var10001 = var2;
+                                 var3 = var10002;
+                                 if (var10002 <= var1) {
+                                    a = d.a((new String(var2)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                    return;
+                                 }
+
+                                 var5 = var2;
+                                 var6 = var1;
+                              }
+
+                              while(true) {
+                                 var9 = var5[var6];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10 = 53;
+                                    break;
+                                 case 1:
+                                    var10 = 22;
+                                    break;
+                                 case 2:
+                                    var10 = 36;
+                                    break;
+                                 case 3:
+                                    var10 = 117;
+                                    break;
+                                 default:
+                                    var10 = 57;
+                                 }
+
+                                 var5[var6] = (char)(var9 ^ var10);
+                                 ++var1;
+                                 if (var3 == 0) {
+                                    var6 = var3;
+                                    var5 = var10001;
+                                 } else {
+                                    if (var3 <= var1) {
+                                       a = d.a((new String(var10001)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                       return;
+                                    }
+
+                                    var5 = var10001;
+                                    var6 = var1;
+                                 }
+                              }
+                           }
+
+                           var8 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 53;
+                              break;
+                           case 1:
+                              var10008 = 22;
+                              break;
+                           case 2:
+                              var10008 = 36;
+                              break;
+                           case 3:
+                              var10008 = 117;
+                              break;
+                           default:
+                              var10008 = 57;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var8 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 53;
+                  break;
+               case 1:
+                  var10008 = 22;
+                  break;
+               case 2:
+                  var10008 = 36;
+                  break;
+               case 3:
+                  var10008 = 117;
+                  break;
+               default:
+                  var10008 = 57;
+               }
+            }
+
+            while(true) {
+               while(true) {
+                  var8[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var6 == 0) {
+                     var10006 = var6;
+                     var8 = var10004;
+                     var10007 = var10004[var6];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 53;
+                        break;
+                     case 1:
+                        var10008 = 22;
+                        break;
+                     case 2:
+                        var10008 = 36;
+                        break;
+                     case 3:
+                        var10008 = 117;
+                        break;
+                     default:
+                        var10008 = 57;
+                     }
+                  } else {
+                     if (var6 <= var1) {
+                        label1119: {
+                           var10000[3] = (new String(var10004)).intern();
+                           var10003 = "S\u007fF]\r\u0007?\u0004\u0002PA~K\u0000M\u0015uE\u0016QP,".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= 1) {
+                              var8 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= var1) {
+                                 break label1119;
+                              }
+
+                              var8 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var8[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 53;
+                                 break;
+                              case 1:
+                                 var10008 = 22;
+                                 break;
+                              case 2:
+                                 var10008 = 36;
+                                 break;
+                              case 3:
+                                 var10008 = 117;
+                                 break;
+                              default:
+                                 var10008 = 57;
+                              }
+
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                              } else {
+                                 if (var6 <= var1) {
+                                    break;
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[4] = (new String(var10004)).intern();
+                        var10003 = "S\u007fF]\r\u0007?\u0004\u0002PA~\u0004\u0016XV~AO".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= 1) {
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 53;
+                              break;
+                           case 1:
+                              var10008 = 22;
+                              break;
+                           case 2:
+                              var10008 = 36;
+                              break;
+                           case 3:
+                              var10008 = 117;
+                              break;
+                           default:
+                              var10008 = 57;
+                           }
+                        } else {
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= var1) {
+                              label1187: {
+                                 var10000[5] = (new String(var10003)).intern();
+                                 var10003 = "bwM\u0001P[q\u0004@\u0019FsG\u001aWQe\u0004\u0001V\u0015zA\u0001\u0019ZcVU\\[bV\u001c\\F6A\rI\\dA[\u0017\u001b".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label1187;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 53;
+                                       break;
+                                    case 1:
+                                       var10008 = 22;
+                                       break;
+                                    case 2:
+                                       var10008 = 36;
+                                       break;
+                                    case 3:
+                                       var10008 = 117;
+                                       break;
+                                    default:
+                                       var10008 = 57;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[6] = (new String(var10004)).intern();
+                              b = var10000;
+                              var2 = "s\u007fF\u001aWTuG\u001c".toCharArray();
+                              var10002 = var2.length;
+                              var1 = 0;
+                              var10001 = var2;
+                              var3 = var10002;
+                              if (var10002 <= 1) {
+                                 var5 = var2;
+                                 var6 = var1;
+                              } else {
+                                 var10001 = var2;
+                                 var3 = var10002;
+                                 if (var10002 <= var1) {
+                                    a = d.a((new String(var2)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                    return;
+                                 }
+
+                                 var5 = var2;
+                                 var6 = var1;
+                              }
+
+                              while(true) {
+                                 var9 = var5[var6];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10 = 53;
+                                    break;
+                                 case 1:
+                                    var10 = 22;
+                                    break;
+                                 case 2:
+                                    var10 = 36;
+                                    break;
+                                 case 3:
+                                    var10 = 117;
+                                    break;
+                                 default:
+                                    var10 = 57;
+                                 }
+
+                                 var5[var6] = (char)(var9 ^ var10);
+                                 ++var1;
+                                 if (var3 == 0) {
+                                    var6 = var3;
+                                    var5 = var10001;
+                                 } else {
+                                    if (var3 <= var1) {
+                                       a = d.a((new String(var10001)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                       return;
+                                    }
+
+                                    var5 = var10001;
+                                    var6 = var1;
+                                 }
+                              }
+                           }
+
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 53;
+                              break;
+                           case 1:
+                              var10008 = 22;
+                              break;
+                           case 2:
+                              var10008 = 36;
+                              break;
+                           case 3:
+                              var10008 = 117;
+                              break;
+                           default:
+                              var10008 = 57;
+                           }
+                        }
+
+                        while(true) {
+                           while(true) {
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                                 var10007 = var10004[var6];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 53;
+                                    break;
+                                 case 1:
+                                    var10008 = 22;
+                                    break;
+                                 case 2:
+                                    var10008 = 36;
+                                    break;
+                                 case 3:
+                                    var10008 = 117;
+                                    break;
+                                 default:
+                                    var10008 = 57;
+                                 }
+                              } else {
+                                 if (var6 <= var1) {
+                                    label1295: {
+                                       var10000[5] = (new String(var10004)).intern();
+                                       var10003 = "bwM\u0001P[q\u0004@\u0019FsG\u001aWQe\u0004\u0001V\u0015zA\u0001\u0019ZcVU\\[bV\u001c\\F6A\rI\\dA[\u0017\u001b".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label1295;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 53;
+                                             break;
+                                          case 1:
+                                             var10008 = 22;
+                                             break;
+                                          case 2:
+                                             var10008 = 36;
+                                             break;
+                                          case 3:
+                                             var10008 = 117;
+                                             break;
+                                          default:
+                                             var10008 = 57;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[6] = (new String(var10004)).intern();
+                                    b = var10000;
+                                    var2 = "s\u007fF\u001aWTuG\u001c".toCharArray();
+                                    var10002 = var2.length;
+                                    var1 = 0;
+                                    var10001 = var2;
+                                    var3 = var10002;
+                                    if (var10002 <= 1) {
+                                       var5 = var2;
+                                       var6 = var1;
+                                    } else {
+                                       var10001 = var2;
+                                       var3 = var10002;
+                                       if (var10002 <= var1) {
+                                          a = d.a((new String(var2)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                          return;
+                                       }
+
+                                       var5 = var2;
+                                       var6 = var1;
+                                    }
+
+                                    while(true) {
+                                       var9 = var5[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10 = 53;
+                                          break;
+                                       case 1:
+                                          var10 = 22;
+                                          break;
+                                       case 2:
+                                          var10 = 36;
+                                          break;
+                                       case 3:
+                                          var10 = 117;
+                                          break;
+                                       default:
+                                          var10 = 57;
+                                       }
+
+                                       var5[var6] = (char)(var9 ^ var10);
+                                       ++var1;
+                                       if (var3 == 0) {
+                                          var6 = var3;
+                                          var5 = var10001;
+                                       } else {
+                                          if (var3 <= var1) {
+                                             a = d.a((new String(var10001)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                             return;
+                                          }
+
+                                          var5 = var10001;
+                                          var6 = var1;
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                                 var10007 = var10004[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 53;
+                                    break;
+                                 case 1:
+                                    var10008 = 22;
+                                    break;
+                                 case 2:
+                                    var10008 = 36;
+                                    break;
+                                 case 3:
+                                    var10008 = 117;
+                                    break;
+                                 default:
+                                    var10008 = 57;
+                                 }
+                              }
+                           }
+                        }
+                     }
+
+                     var8 = var10004;
+                     var10006 = var1;
+                     var10007 = var10004[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 53;
+                        break;
+                     case 1:
+                        var10008 = 22;
+                        break;
+                     case 2:
+                        var10008 = 36;
+                        break;
+                     case 3:
+                        var10008 = 117;
+                        break;
+                     default:
+                        var10008 = 57;
+                     }
+                  }
+               }
+            }
+         }
+
+         var8 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 53;
+            break;
+         case 1:
+            var10008 = 22;
+            break;
+         case 2:
+            var10008 = 36;
+            break;
+         case 3:
+            var10008 = 117;
+            break;
+         default:
+            var10008 = 57;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var8[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var6 == 0) {
+               var10006 = var6;
+               var8 = var10004;
+               var10007 = var10004[var6];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 53;
+                  break;
+               case 1:
+                  var10008 = 22;
+                  break;
+               case 2:
+                  var10008 = 36;
+                  break;
+               case 3:
+                  var10008 = 117;
+                  break;
+               default:
+                  var10008 = 57;
+               }
+            } else {
+               if (var6 <= var1) {
+                  label333: {
+                     var10000[1] = (new String(var10004)).intern();
+                     var10003 = "}\u007fPXkTbAO\u0019".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var6 = var10005;
+                     if (var10005 <= 1) {
+                        var8 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= var1) {
+                           break label333;
+                        }
+
+                        var8 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var8[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 53;
+                           break;
+                        case 1:
+                           var10008 = 22;
+                           break;
+                        case 2:
+                           var10008 = 36;
+                           break;
+                        case 3:
+                           var10008 = 117;
+                           break;
+                        default:
+                           var10008 = 57;
+                        }
+
+                        var8[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var6 == 0) {
+                           var10006 = var6;
+                           var8 = var10004;
+                        } else {
+                           if (var6 <= var1) {
+                              break;
+                           }
+
+                           var8 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[2] = (new String(var10004)).intern();
+                  var10003 = "gcJ\u001bP[q\u0004\u0016XV~AX\\C\u007fG\u0001PZx\n[\u0017".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var6 = var10005;
+                  if (var10005 <= 1) {
+                     var8 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 53;
+                        break;
+                     case 1:
+                        var10008 = 22;
+                        break;
+                     case 2:
+                        var10008 = 36;
+                        break;
+                     case 3:
+                        var10008 = 117;
+                        break;
+                     default:
+                        var10008 = 57;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var6 = var10005;
+                     if (var10005 <= var1) {
+                        label377: {
+                           var10000[3] = (new String(var10003)).intern();
+                           var10003 = "S\u007fF]\r\u0007?\u0004\u0002PA~K\u0000M\u0015uE\u0016QP,".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= 1) {
+                              var8 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= var1) {
+                                 break label377;
+                              }
+
+                              var8 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var8[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 53;
+                                 break;
+                              case 1:
+                                 var10008 = 22;
+                                 break;
+                              case 2:
+                                 var10008 = 36;
+                                 break;
+                              case 3:
+                                 var10008 = 117;
+                                 break;
+                              default:
+                                 var10008 = 57;
+                              }
+
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                              } else {
+                                 if (var6 <= var1) {
+                                    break;
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[4] = (new String(var10004)).intern();
+                        var10003 = "S\u007fF]\r\u0007?\u0004\u0002PA~\u0004\u0016XV~AO".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= 1) {
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 53;
+                              break;
+                           case 1:
+                              var10008 = 22;
+                              break;
+                           case 2:
+                              var10008 = 36;
+                              break;
+                           case 3:
+                              var10008 = 117;
+                              break;
+                           default:
+                              var10008 = 57;
+                           }
+                        } else {
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= var1) {
+                              label445: {
+                                 var10000[5] = (new String(var10003)).intern();
+                                 var10003 = "bwM\u0001P[q\u0004@\u0019FsG\u001aWQe\u0004\u0001V\u0015zA\u0001\u0019ZcVU\\[bV\u001c\\F6A\rI\\dA[\u0017\u001b".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label445;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 53;
+                                       break;
+                                    case 1:
+                                       var10008 = 22;
+                                       break;
+                                    case 2:
+                                       var10008 = 36;
+                                       break;
+                                    case 3:
+                                       var10008 = 117;
+                                       break;
+                                    default:
+                                       var10008 = 57;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[6] = (new String(var10004)).intern();
+                              b = var10000;
+                              var2 = "s\u007fF\u001aWTuG\u001c".toCharArray();
+                              var10002 = var2.length;
+                              var1 = 0;
+                              var10001 = var2;
+                              var3 = var10002;
+                              if (var10002 <= 1) {
+                                 var5 = var2;
+                                 var6 = var1;
+                              } else {
+                                 var10001 = var2;
+                                 var3 = var10002;
+                                 if (var10002 <= var1) {
+                                    a = d.a((new String(var2)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                    return;
+                                 }
+
+                                 var5 = var2;
+                                 var6 = var1;
+                              }
+
+                              while(true) {
+                                 var9 = var5[var6];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10 = 53;
+                                    break;
+                                 case 1:
+                                    var10 = 22;
+                                    break;
+                                 case 2:
+                                    var10 = 36;
+                                    break;
+                                 case 3:
+                                    var10 = 117;
+                                    break;
+                                 default:
+                                    var10 = 57;
+                                 }
+
+                                 var5[var6] = (char)(var9 ^ var10);
+                                 ++var1;
+                                 if (var3 == 0) {
+                                    var6 = var3;
+                                    var5 = var10001;
+                                 } else {
+                                    if (var3 <= var1) {
+                                       a = d.a((new String(var10001)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                       return;
+                                    }
+
+                                    var5 = var10001;
+                                    var6 = var1;
+                                 }
+                              }
+                           }
+
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 53;
+                              break;
+                           case 1:
+                              var10008 = 22;
+                              break;
+                           case 2:
+                              var10008 = 36;
+                              break;
+                           case 3:
+                              var10008 = 117;
+                              break;
+                           default:
+                              var10008 = 57;
+                           }
+                        }
+
+                        while(true) {
+                           while(true) {
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                                 var10007 = var10004[var6];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 53;
+                                    break;
+                                 case 1:
+                                    var10008 = 22;
+                                    break;
+                                 case 2:
+                                    var10008 = 36;
+                                    break;
+                                 case 3:
+                                    var10008 = 117;
+                                    break;
+                                 default:
+                                    var10008 = 57;
+                                 }
+                              } else {
+                                 if (var6 <= var1) {
+                                    label553: {
+                                       var10000[5] = (new String(var10004)).intern();
+                                       var10003 = "bwM\u0001P[q\u0004@\u0019FsG\u001aWQe\u0004\u0001V\u0015zA\u0001\u0019ZcVU\\[bV\u001c\\F6A\rI\\dA[\u0017\u001b".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label553;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 53;
+                                             break;
+                                          case 1:
+                                             var10008 = 22;
+                                             break;
+                                          case 2:
+                                             var10008 = 36;
+                                             break;
+                                          case 3:
+                                             var10008 = 117;
+                                             break;
+                                          default:
+                                             var10008 = 57;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[6] = (new String(var10004)).intern();
+                                    b = var10000;
+                                    var2 = "s\u007fF\u001aWTuG\u001c".toCharArray();
+                                    var10002 = var2.length;
+                                    var1 = 0;
+                                    var10001 = var2;
+                                    var3 = var10002;
+                                    if (var10002 <= 1) {
+                                       var5 = var2;
+                                       var6 = var1;
+                                    } else {
+                                       var10001 = var2;
+                                       var3 = var10002;
+                                       if (var10002 <= var1) {
+                                          a = d.a((new String(var2)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                          return;
+                                       }
+
+                                       var5 = var2;
+                                       var6 = var1;
+                                    }
+
+                                    while(true) {
+                                       var9 = var5[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10 = 53;
+                                          break;
+                                       case 1:
+                                          var10 = 22;
+                                          break;
+                                       case 2:
+                                          var10 = 36;
+                                          break;
+                                       case 3:
+                                          var10 = 117;
+                                          break;
+                                       default:
+                                          var10 = 57;
+                                       }
+
+                                       var5[var6] = (char)(var9 ^ var10);
+                                       ++var1;
+                                       if (var3 == 0) {
+                                          var6 = var3;
+                                          var5 = var10001;
+                                       } else {
+                                          if (var3 <= var1) {
+                                             a = d.a((new String(var10001)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                             return;
+                                          }
+
+                                          var5 = var10001;
+                                          var6 = var1;
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                                 var10007 = var10004[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 53;
+                                    break;
+                                 case 1:
+                                    var10008 = 22;
+                                    break;
+                                 case 2:
+                                    var10008 = 36;
+                                    break;
+                                 case 3:
+                                    var10008 = 117;
+                                    break;
+                                 default:
+                                    var10008 = 57;
+                                 }
+                              }
+                           }
+                        }
+                     }
+
+                     var8 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 53;
+                        break;
+                     case 1:
+                        var10008 = 22;
+                        break;
+                     case 2:
+                        var10008 = 36;
+                        break;
+                     case 3:
+                        var10008 = 117;
+                        break;
+                     default:
+                        var10008 = 57;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var8[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var6 == 0) {
+                           var10006 = var6;
+                           var8 = var10004;
+                           var10007 = var10004[var6];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 53;
+                              break;
+                           case 1:
+                              var10008 = 22;
+                              break;
+                           case 2:
+                              var10008 = 36;
+                              break;
+                           case 3:
+                              var10008 = 117;
+                              break;
+                           default:
+                              var10008 = 57;
+                           }
+                        } else {
+                           if (var6 <= var1) {
+                              label172: {
+                                 var10000[3] = (new String(var10004)).intern();
+                                 var10003 = "S\u007fF]\r\u0007?\u0004\u0002PA~K\u0000M\u0015uE\u0016QP,".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label172;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 53;
+                                       break;
+                                    case 1:
+                                       var10008 = 22;
+                                       break;
+                                    case 2:
+                                       var10008 = 36;
+                                       break;
+                                    case 3:
+                                       var10008 = 117;
+                                       break;
+                                    default:
+                                       var10008 = 57;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[4] = (new String(var10004)).intern();
+                              var10003 = "S\u007fF]\r\u0007?\u0004\u0002PA~\u0004\u0016XV~AO".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= 1) {
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 53;
+                                    break;
+                                 case 1:
+                                    var10008 = 22;
+                                    break;
+                                 case 2:
+                                    var10008 = 36;
+                                    break;
+                                 case 3:
+                                    var10008 = 117;
+                                    break;
+                                 default:
+                                    var10008 = 57;
+                                 }
+                              } else {
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= var1) {
+                                    label216: {
+                                       var10000[5] = (new String(var10003)).intern();
+                                       var10003 = "bwM\u0001P[q\u0004@\u0019FsG\u001aWQe\u0004\u0001V\u0015zA\u0001\u0019ZcVU\\[bV\u001c\\F6A\rI\\dA[\u0017\u001b".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label216;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 53;
+                                             break;
+                                          case 1:
+                                             var10008 = 22;
+                                             break;
+                                          case 2:
+                                             var10008 = 36;
+                                             break;
+                                          case 3:
+                                             var10008 = 117;
+                                             break;
+                                          default:
+                                             var10008 = 57;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[6] = (new String(var10004)).intern();
+                                    b = var10000;
+                                    var2 = "s\u007fF\u001aWTuG\u001c".toCharArray();
+                                    var10002 = var2.length;
+                                    var1 = 0;
+                                    var10001 = var2;
+                                    var3 = var10002;
+                                    if (var10002 <= 1) {
+                                       var5 = var2;
+                                       var6 = var1;
+                                    } else {
+                                       var10001 = var2;
+                                       var3 = var10002;
+                                       if (var10002 <= var1) {
+                                          a = d.a((new String(var2)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                          return;
+                                       }
+
+                                       var5 = var2;
+                                       var6 = var1;
+                                    }
+
+                                    while(true) {
+                                       var9 = var5[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10 = 53;
+                                          break;
+                                       case 1:
+                                          var10 = 22;
+                                          break;
+                                       case 2:
+                                          var10 = 36;
+                                          break;
+                                       case 3:
+                                          var10 = 117;
+                                          break;
+                                       default:
+                                          var10 = 57;
+                                       }
+
+                                       var5[var6] = (char)(var9 ^ var10);
+                                       ++var1;
+                                       if (var3 == 0) {
+                                          var6 = var3;
+                                          var5 = var10001;
+                                       } else {
+                                          if (var3 <= var1) {
+                                             a = d.a((new String(var10001)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                             return;
+                                          }
+
+                                          var5 = var10001;
+                                          var6 = var1;
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 53;
+                                    break;
+                                 case 1:
+                                    var10008 = 22;
+                                    break;
+                                 case 2:
+                                    var10008 = 36;
+                                    break;
+                                 case 3:
+                                    var10008 = 117;
+                                    break;
+                                 default:
+                                    var10008 = 57;
+                                 }
+                              }
+
+                              while(true) {
+                                 while(true) {
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                       var10007 = var10004[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 53;
+                                          break;
+                                       case 1:
+                                          var10008 = 22;
+                                          break;
+                                       case 2:
+                                          var10008 = 36;
+                                          break;
+                                       case 3:
+                                          var10008 = 117;
+                                          break;
+                                       default:
+                                          var10008 = 57;
+                                       }
+                                    } else {
+                                       if (var6 <= var1) {
+                                          label136: {
+                                             var10000[5] = (new String(var10004)).intern();
+                                             var10003 = "bwM\u0001P[q\u0004@\u0019FsG\u001aWQe\u0004\u0001V\u0015zA\u0001\u0019ZcVU\\[bV\u001c\\F6A\rI\\dA[\u0017\u001b".toCharArray();
+                                             var10005 = var10003.length;
+                                             var1 = 0;
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= 1) {
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             } else {
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= var1) {
+                                                   break label136;
+                                                }
+
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             }
+
+                                             while(true) {
+                                                var10007 = var8[var10006];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10008 = 53;
+                                                   break;
+                                                case 1:
+                                                   var10008 = 22;
+                                                   break;
+                                                case 2:
+                                                   var10008 = 36;
+                                                   break;
+                                                case 3:
+                                                   var10008 = 117;
+                                                   break;
+                                                default:
+                                                   var10008 = 57;
+                                                }
+
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          var10000[6] = (new String(var10004)).intern();
+                                          b = var10000;
+                                          var2 = "s\u007fF\u001aWTuG\u001c".toCharArray();
+                                          var10002 = var2.length;
+                                          var1 = 0;
+                                          var10001 = var2;
+                                          var3 = var10002;
+                                          if (var10002 <= 1) {
+                                             var5 = var2;
+                                             var6 = var1;
+                                          } else {
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= var1) {
+                                                a = d.a((new String(var2)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                                return;
+                                             }
+
+                                             var5 = var2;
+                                             var6 = var1;
+                                          }
+
+                                          while(true) {
+                                             var9 = var5[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10 = 53;
+                                                break;
+                                             case 1:
+                                                var10 = 22;
+                                                break;
+                                             case 2:
+                                                var10 = 36;
+                                                break;
+                                             case 3:
+                                                var10 = 117;
+                                                break;
+                                             default:
+                                                var10 = 57;
+                                             }
+
+                                             var5[var6] = (char)(var9 ^ var10);
+                                             ++var1;
+                                             if (var3 == 0) {
+                                                var6 = var3;
+                                                var5 = var10001;
+                                             } else {
+                                                if (var3 <= var1) {
+                                                   a = d.a((new String(var10001)).intern(), 10, 2L, TimeUnit.SECONDS);
+                                                   return;
+                                                }
+
+                                                var5 = var10001;
+                                                var6 = var1;
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                       var10007 = var10004[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 53;
+                                          break;
+                                       case 1:
+                                          var10008 = 22;
+                                          break;
+                                       case 2:
+                                          var10008 = 36;
+                                          break;
+                                       case 3:
+                                          var10008 = 117;
+                                          break;
+                                       default:
+                                          var10008 = 57;
+                                       }
+                                    }
+                                 }
+                              }
+                           }
+
+                           var8 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 53;
+                              break;
+                           case 1:
+                              var10008 = 22;
+                              break;
+                           case 2:
+                              var10008 = 36;
+                              break;
+                           case 3:
+                              var10008 = 117;
+                              break;
+                           default:
+                              var10008 = 57;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var8 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 53;
+                  break;
+               case 1:
+                  var10008 = 22;
+                  break;
+               case 2:
+                  var10008 = 36;
+                  break;
+               case 3:
+                  var10008 = 117;
+                  break;
+               default:
+                  var10008 = 57;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/a4.java b/testData/obfuscated/a4.java
new file mode 100644
index 0000000..e0307cf
--- /dev/null
+++ b/testData/obfuscated/a4.java
@@ -0,0 +1,164 @@
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.logging.Level;
+
+@aa(
+   a = {ac.class}
+)
+public class a4 implements ac {
+   private static boolean a;
+   private static y<ad> b;
+   private static final String[] c;
+
+   public static void main(String[] var0) throws Exception {
+      t.a.setLevel(Level.FINE);
+      t.a();
+      a = true;
+
+      while(true) {
+         Thread.sleep(10000L);
+         System.out.println(c[1] + ((ad)b.a()).a());
+      }
+   }
+
+   public void a() throws Exception {
+      try {
+         if (a) {
+            System.out.println(c[0] + DateFormat.getTimeInstance().format(new Date()));
+         }
+
+      } catch (Exception var1) {
+         throw var1;
+      }
+   }
+
+   static {
+      String[] var10000;
+      int var1;
+      int var2;
+      char[] var10003;
+      char[] var10004;
+      char[] var4;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label51: {
+         var10000 = new String[2];
+         var10003 = "f\u0019\u0016n-[\u001c\u0016n0AKS".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= 1) {
+            var4 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= var1) {
+               break label51;
+            }
+
+            var4 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var4[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 50;
+               break;
+            case 1:
+               var10008 = 113;
+               break;
+            case 2:
+               var10008 = 115;
+               break;
+            case 3:
+               var10008 = 78;
+               break;
+            default:
+               var10008 = 89;
+            }
+
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "~\u0010\u0000:y[\u001f\u0005!:S\u0005\u001a!7\bQ".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var2 = var10005;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            var10000[1] = (new String(var10003)).intern();
+            c = var10000;
+            a = false;
+            b = y.a(ad.class);
+            return;
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+      }
+
+      while(true) {
+         var10007 = var4[var10006];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 50;
+            break;
+         case 1:
+            var10008 = 113;
+            break;
+         case 2:
+            var10008 = 115;
+            break;
+         case 3:
+            var10008 = 78;
+            break;
+         default:
+            var10008 = 89;
+         }
+
+         var4[var10006] = (char)(var10007 ^ var10008);
+         ++var1;
+         if (var2 == 0) {
+            var10006 = var2;
+            var4 = var10004;
+         } else {
+            if (var2 <= var1) {
+               var10000[1] = (new String(var10004)).intern();
+               c = var10000;
+               a = false;
+               b = y.a(ad.class);
+               return;
+            }
+
+            var4 = var10004;
+            var10006 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/a5.java b/testData/obfuscated/a5.java
new file mode 100644
index 0000000..cad3502
--- /dev/null
+++ b/testData/obfuscated/a5.java
@@ -0,0 +1,921 @@
+import java.text.DecimalFormat;
+import java.util.Iterator;
+import java.util.concurrent.TimeUnit;
+
+public class a5 {
+   private static y<ai> a;
+   private static final String[] b;
+
+   public static void main(String[] var0) throws Exception {
+      t.a();
+
+      while(true) {
+         System.out.println(b[1]);
+         Thread.sleep(TimeUnit.MILLISECONDS.convert(60L, TimeUnit.SECONDS));
+         a();
+         System.out.println(b[0]);
+      }
+   }
+
+   private static void a() {
+      boolean var2 = a7.b;
+      Iterator var0 = ((ai)a.a()).a().iterator();
+
+      while(var0.hasNext()) {
+         al var1 = (al)var0.next();
+         System.out.println(var1.a().a() + b[3] + var1.a().b() + "\n" + DecimalFormat.getNumberInstance().format(var1.d()) + " " + var1.a().c() + b[4] + DecimalFormat.getNumberInstance().format(var1.e()) + " " + var1.a().c() + b[2] + DecimalFormat.getNumberInstance().format(var1.f()) + " " + var1.a().c() + "\n");
+         if (var2) {
+            break;
+         }
+      }
+
+   }
+
+   static {
+      String[] var10000 = new String[5];
+      char[] var10003 = "`\u001dY>>`\u001dY>>`\u001dY>>`\u001dY>>`\u001dY>>`\u001dY>>`\u001dY>".toCharArray();
+      int var10005 = var10003.length;
+      int var1 = 0;
+      char[] var10004 = var10003;
+      int var2 = var10005;
+      char[] var4;
+      int var10006;
+      char var10007;
+      byte var10008;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 77;
+            break;
+         case 1:
+            var10008 = 48;
+            break;
+         case 2:
+            var10008 = 116;
+            break;
+         case 3:
+            var10008 = 19;
+            break;
+         default:
+            var10008 = 19;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label316: {
+               var10000[0] = (new String(var10003)).intern();
+               var10003 = "\u001aQ\u001dgz#WT|}(\u0010\u0019z}8D\u0011==c".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label316;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 77;
+                     break;
+                  case 1:
+                     var10008 = 48;
+                     break;
+                  case 2:
+                     var10008 = 116;
+                     break;
+                  case 3:
+                     var10008 = 19;
+                     break;
+                  default:
+                     var10008 = 19;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[1] = (new String(var10004)).intern();
+            var10003 = "a\u00105etm\u0002@{)m".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 77;
+                  break;
+               case 1:
+                  var10008 = 48;
+                  break;
+               case 2:
+                  var10008 = 116;
+                  break;
+               case 3:
+                  var10008 = 19;
+                  break;
+               default:
+                  var10008 = 19;
+               }
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  label384: {
+                     var10000[2] = (new String(var10003)).intern();
+                     var10003 = "m\u001dT".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label384;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 77;
+                           break;
+                        case 1:
+                           var10008 = 48;
+                           break;
+                        case 2:
+                           var10008 = 116;
+                           break;
+                        case 3:
+                           var10008 = 19;
+                           break;
+                        default:
+                           var10008 = 19;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[3] = (new String(var10004)).intern();
+                  var10003 = "a\u00105etc\u0010G#~$^N3".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[4] = (new String(var10003)).intern();
+                        b = var10000;
+                        a = y.a(ai.class);
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 77;
+                        break;
+                     case 1:
+                        var10008 = 48;
+                        break;
+                     case 2:
+                        var10008 = 116;
+                        break;
+                     case 3:
+                        var10008 = 19;
+                        break;
+                     default:
+                        var10008 = 19;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[4] = (new String(var10004)).intern();
+                           b = var10000;
+                           a = y.a(ai.class);
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 77;
+                  break;
+               case 1:
+                  var10008 = 48;
+                  break;
+               case 2:
+                  var10008 = 116;
+                  break;
+               case 3:
+                  var10008 = 19;
+                  break;
+               default:
+                  var10008 = 19;
+               }
+            }
+
+            while(true) {
+               while(true) {
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                     var10007 = var10004[var2];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 77;
+                        break;
+                     case 1:
+                        var10008 = 48;
+                        break;
+                     case 2:
+                        var10008 = 116;
+                        break;
+                     case 3:
+                        var10008 = 19;
+                        break;
+                     default:
+                        var10008 = 19;
+                     }
+                  } else {
+                     if (var2 <= var1) {
+                        label492: {
+                           var10000[2] = (new String(var10004)).intern();
+                           var10003 = "m\u001dT".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label492;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 77;
+                                 break;
+                              case 1:
+                                 var10008 = 48;
+                                 break;
+                              case 2:
+                                 var10008 = 116;
+                                 break;
+                              case 3:
+                                 var10008 = 19;
+                                 break;
+                              default:
+                                 var10008 = 19;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "a\u00105etc\u0010G#~$^N3".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[4] = (new String(var10003)).intern();
+                              b = var10000;
+                              a = y.a(ai.class);
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 77;
+                              break;
+                           case 1:
+                              var10008 = 48;
+                              break;
+                           case 2:
+                              var10008 = 116;
+                              break;
+                           case 3:
+                              var10008 = 19;
+                              break;
+                           default:
+                              var10008 = 19;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 b = var10000;
+                                 a = y.a(ai.class);
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                     var10007 = var10004[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 77;
+                        break;
+                     case 1:
+                        var10008 = 48;
+                        break;
+                     case 2:
+                        var10008 = 116;
+                        break;
+                     case 3:
+                        var10008 = 19;
+                        break;
+                     default:
+                        var10008 = 19;
+                     }
+                  }
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 77;
+            break;
+         case 1:
+            var10008 = 48;
+            break;
+         case 2:
+            var10008 = 116;
+            break;
+         case 3:
+            var10008 = 19;
+            break;
+         default:
+            var10008 = 19;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 77;
+                  break;
+               case 1:
+                  var10008 = 48;
+                  break;
+               case 2:
+                  var10008 = 116;
+                  break;
+               case 3:
+                  var10008 = 19;
+                  break;
+               default:
+                  var10008 = 19;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label129: {
+                     var10000[0] = (new String(var10004)).intern();
+                     var10003 = "\u001aQ\u001dgz#WT|}(\u0010\u0019z}8D\u0011==c".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label129;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 77;
+                           break;
+                        case 1:
+                           var10008 = 48;
+                           break;
+                        case 2:
+                           var10008 = 116;
+                           break;
+                        case 3:
+                           var10008 = 19;
+                           break;
+                        default:
+                           var10008 = 19;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[1] = (new String(var10004)).intern();
+                  var10003 = "a\u00105etm\u0002@{)m".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 77;
+                        break;
+                     case 1:
+                        var10008 = 48;
+                        break;
+                     case 2:
+                        var10008 = 116;
+                        break;
+                     case 3:
+                        var10008 = 19;
+                        break;
+                     default:
+                        var10008 = 19;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        label173: {
+                           var10000[2] = (new String(var10003)).intern();
+                           var10003 = "m\u001dT".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label173;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 77;
+                                 break;
+                              case 1:
+                                 var10008 = 48;
+                                 break;
+                              case 2:
+                                 var10008 = 116;
+                                 break;
+                              case 3:
+                                 var10008 = 19;
+                                 break;
+                              default:
+                                 var10008 = 19;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "a\u00105etc\u0010G#~$^N3".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[4] = (new String(var10003)).intern();
+                              b = var10000;
+                              a = y.a(ai.class);
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 77;
+                              break;
+                           case 1:
+                              var10008 = 48;
+                              break;
+                           case 2:
+                              var10008 = 116;
+                              break;
+                           case 3:
+                              var10008 = 19;
+                              break;
+                           default:
+                              var10008 = 19;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 b = var10000;
+                                 a = y.a(ai.class);
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 77;
+                        break;
+                     case 1:
+                        var10008 = 48;
+                        break;
+                     case 2:
+                        var10008 = 116;
+                        break;
+                     case 3:
+                        var10008 = 19;
+                        break;
+                     default:
+                        var10008 = 19;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                           var10007 = var10004[var2];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 77;
+                              break;
+                           case 1:
+                              var10008 = 48;
+                              break;
+                           case 2:
+                              var10008 = 116;
+                              break;
+                           case 3:
+                              var10008 = 19;
+                              break;
+                           default:
+                              var10008 = 19;
+                           }
+                        } else {
+                           if (var2 <= var1) {
+                              label93: {
+                                 var10000[2] = (new String(var10004)).intern();
+                                 var10003 = "m\u001dT".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= 1) {
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var2 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label93;
+                                    }
+
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var4[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 77;
+                                       break;
+                                    case 1:
+                                       var10008 = 48;
+                                       break;
+                                    case 2:
+                                       var10008 = 116;
+                                       break;
+                                    case 3:
+                                       var10008 = 19;
+                                       break;
+                                    default:
+                                       var10008 = 19;
+                                    }
+
+                                    var4[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var2 == 0) {
+                                       var10006 = var2;
+                                       var4 = var10004;
+                                    } else {
+                                       if (var2 <= var1) {
+                                          break;
+                                       }
+
+                                       var4 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[3] = (new String(var10004)).intern();
+                              var10003 = "a\u00105etc\u0010G#~$^N3".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= 1) {
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              } else {
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= var1) {
+                                    var10000[4] = (new String(var10003)).intern();
+                                    b = var10000;
+                                    a = y.a(ai.class);
+                                    return;
+                                 }
+
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              }
+
+                              while(true) {
+                                 var10007 = var4[var10006];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 77;
+                                    break;
+                                 case 1:
+                                    var10008 = 48;
+                                    break;
+                                 case 2:
+                                    var10008 = 116;
+                                    break;
+                                 case 3:
+                                    var10008 = 19;
+                                    break;
+                                 default:
+                                    var10008 = 19;
+                                 }
+
+                                 var4[var10006] = (char)(var10007 ^ var10008);
+                                 ++var1;
+                                 if (var2 == 0) {
+                                    var10006 = var2;
+                                    var4 = var10004;
+                                 } else {
+                                    if (var2 <= var1) {
+                                       var10000[4] = (new String(var10004)).intern();
+                                       b = var10000;
+                                       a = y.a(ai.class);
+                                       return;
+                                    }
+
+                                    var4 = var10004;
+                                    var10006 = var1;
+                                 }
+                              }
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 77;
+                              break;
+                           case 1:
+                              var10008 = 48;
+                              break;
+                           case 2:
+                              var10008 = 116;
+                              break;
+                           case 3:
+                              var10008 = 19;
+                              break;
+                           default:
+                              var10008 = 19;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 77;
+                  break;
+               case 1:
+                  var10008 = 48;
+                  break;
+               case 2:
+                  var10008 = 116;
+                  break;
+               case 3:
+                  var10008 = 19;
+                  break;
+               default:
+                  var10008 = 19;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/a6.java b/testData/obfuscated/a6.java
new file mode 100644
index 0000000..f935895
--- /dev/null
+++ b/testData/obfuscated/a6.java
@@ -0,0 +1,5 @@
+public class a6 {
+   public static void main(String[] param0) throws Exception {
+      // $FF: Couldn't be decompiled
+   }
+}
diff --git a/testData/obfuscated/a7.java b/testData/obfuscated/a7.java
new file mode 100644
index 0000000..3e6e15f
--- /dev/null
+++ b/testData/obfuscated/a7.java
@@ -0,0 +1,139 @@
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+public class a7 {
+   public static boolean b;
+   private static final String[] a;
+
+   public static void main(String[] var0) throws Exception {
+      bc var1 = new bc();
+      var1.a(a[0], new a8());
+      var1.a((InputStream)(new FileInputStream(a[1])));
+   }
+
+   static {
+      String[] var10000;
+      int var1;
+      int var2;
+      char[] var10003;
+      char[] var10004;
+      char[] var4;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label51: {
+         var10000 = new String[2];
+         var10003 = "Z7wN".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= 1) {
+            var4 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= var1) {
+               break label51;
+            }
+
+            var4 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var4[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 52;
+               break;
+            case 1:
+               var10008 = 88;
+               break;
+            case 2:
+               var10008 = 19;
+               break;
+            case 3:
+               var10008 = 43;
+               break;
+            default:
+               var10008 = 10;
+            }
+
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "G*p\u0004oL9~[fQ+<_oG,=SgX".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var2 = var10005;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            var10000[1] = (new String(var10003)).intern();
+            a = var10000;
+            return;
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+      }
+
+      while(true) {
+         var10007 = var4[var10006];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 52;
+            break;
+         case 1:
+            var10008 = 88;
+            break;
+         case 2:
+            var10008 = 19;
+            break;
+         case 3:
+            var10008 = 43;
+            break;
+         default:
+            var10008 = 10;
+         }
+
+         var4[var10006] = (char)(var10007 ^ var10008);
+         ++var1;
+         if (var2 == 0) {
+            var10006 = var2;
+            var4 = var10004;
+         } else {
+            if (var2 <= var1) {
+               var10000[1] = (new String(var10004)).intern();
+               a = var10000;
+               return;
+            }
+
+            var4 = var10004;
+            var10006 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/a8.java b/testData/obfuscated/a8.java
new file mode 100644
index 0000000..7e8744a
--- /dev/null
+++ b/testData/obfuscated/a8.java
@@ -0,0 +1,405 @@
+final class a8 implements ay {
+   private static final String[] a;
+
+   public void a(a0 param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   static {
+      String[] var10000;
+      int var1;
+      int var2;
+      char[] var10003;
+      char[] var10004;
+      char[] var4;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label115: {
+         var10000 = new String[4];
+         var10003 = "(\u000f7O".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= 1) {
+            var4 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= var1) {
+               break label115;
+            }
+
+            var4 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var4[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 70;
+               break;
+            case 1:
+               var10008 = 110;
+               break;
+            case 2:
+               var10008 = 90;
+               break;
+            case 3:
+               var10008 = 42;
+               break;
+            default:
+               var10008 = 64;
+            }
+
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "4\u000b)E54\r?Yo4\u000b)E54\r?q\u00002\u0017*O}a\u001a?Y4a3".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var2 = var10005;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 70;
+            break;
+         case 1:
+            var10008 = 110;
+            break;
+         case 2:
+            var10008 = 90;
+            break;
+         case 3:
+            var10008 = 42;
+            break;
+         default:
+            var10008 = 64;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label158: {
+               var10000[1] = (new String(var10003)).intern();
+               var10003 = "6\u001c3I%".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label158;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 70;
+                     break;
+                  case 1:
+                     var10008 = 110;
+                     break;
+                  case 2:
+                     var10008 = 90;
+                     break;
+                  case 3:
+                     var10008 = 42;
+                     break;
+                  default:
+                     var10008 = 64;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[2] = (new String(var10004)).intern();
+            var10003 = "4\u000b)E54\r?Yo4\u000b)E54\r?q\u00002\u0017*O}a\u001a?Y4a3".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  var10000[3] = (new String(var10003)).intern();
+                  a = var10000;
+                  return;
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+            }
+
+            while(true) {
+               var10007 = var4[var10006];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 70;
+                  break;
+               case 1:
+                  var10008 = 110;
+                  break;
+               case 2:
+                  var10008 = 90;
+                  break;
+               case 3:
+                  var10008 = 42;
+                  break;
+               default:
+                  var10008 = 64;
+               }
+
+               var4[var10006] = (char)(var10007 ^ var10008);
+               ++var1;
+               if (var2 == 0) {
+                  var10006 = var2;
+                  var4 = var10004;
+               } else {
+                  if (var2 <= var1) {
+                     var10000[3] = (new String(var10004)).intern();
+                     a = var10000;
+                     return;
+                  }
+
+                  var4 = var10004;
+                  var10006 = var1;
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 70;
+            break;
+         case 1:
+            var10008 = 110;
+            break;
+         case 2:
+            var10008 = 90;
+            break;
+         case 3:
+            var10008 = 42;
+            break;
+         default:
+            var10008 = 64;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 70;
+                  break;
+               case 1:
+                  var10008 = 110;
+                  break;
+               case 2:
+                  var10008 = 90;
+                  break;
+               case 3:
+                  var10008 = 42;
+                  break;
+               default:
+                  var10008 = 64;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label79: {
+                     var10000[1] = (new String(var10004)).intern();
+                     var10003 = "6\u001c3I%".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label79;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 70;
+                           break;
+                        case 1:
+                           var10008 = 110;
+                           break;
+                        case 2:
+                           var10008 = 90;
+                           break;
+                        case 3:
+                           var10008 = 42;
+                           break;
+                        default:
+                           var10008 = 64;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[2] = (new String(var10004)).intern();
+                  var10003 = "4\u000b)E54\r?Yo4\u000b)E54\r?q\u00002\u0017*O}a\u001a?Y4a3".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[3] = (new String(var10003)).intern();
+                        a = var10000;
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 70;
+                        break;
+                     case 1:
+                        var10008 = 110;
+                        break;
+                     case 2:
+                        var10008 = 90;
+                        break;
+                     case 3:
+                        var10008 = 42;
+                        break;
+                     default:
+                        var10008 = 64;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[3] = (new String(var10004)).intern();
+                           a = var10000;
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 70;
+                  break;
+               case 1:
+                  var10008 = 110;
+                  break;
+               case 2:
+                  var10008 = 90;
+                  break;
+               case 3:
+                  var10008 = 42;
+                  break;
+               default:
+                  var10008 = 64;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/a9.java b/testData/obfuscated/a9.java
new file mode 100644
index 0000000..017a83b
--- /dev/null
+++ b/testData/obfuscated/a9.java
@@ -0,0 +1,15 @@
+public class a9 extends RuntimeException {
+   private static final long serialVersionUID = 1180433275280350911L;
+
+   public a9(String var1, Throwable var2) {
+      super(var1, var2);
+   }
+
+   public a9(Throwable var1) {
+      super(var1);
+   }
+
+   public a9(String var1) {
+      super(var1);
+   }
+}
diff --git a/testData/obfuscated/a_.java b/testData/obfuscated/a_.java
new file mode 100644
index 0000000..a1fd30c
--- /dev/null
+++ b/testData/obfuscated/a_.java
@@ -0,0 +1,8 @@
+class a_ extends RuntimeException {
+   private static final long serialVersionUID = -7454219131982518216L;
+   final bc a;
+
+   a_(bc var1) {
+      this.a = var1;
+   }
+}
diff --git a/testData/obfuscated/aa.java b/testData/obfuscated/aa.java
new file mode 100644
index 0000000..646a3d3
--- /dev/null
+++ b/testData/obfuscated/aa.java
@@ -0,0 +1,10 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+public @interface aa {
+   Class<?>[] a();
+}
diff --git a/testData/obfuscated/ab.java b/testData/obfuscated/ab.java
new file mode 100644
index 0000000..935ee07
--- /dev/null
+++ b/testData/obfuscated/ab.java
@@ -0,0 +1,43 @@
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class ab implements u {
+   private List<Object> a = new ArrayList();
+
+   public void a(Class<?> param1) throws Exception {
+      // $FF: Couldn't be decompiled
+   }
+
+   public void a() throws Exception {
+      int var3 = y.d;
+      Iterator var1 = this.a.iterator();
+
+      while(true) {
+         if (var1.hasNext()) {
+            Object var2 = var1.next();
+
+            try {
+               v.a(var2);
+               if (var3 != 0) {
+                  break;
+               }
+
+               if (var3 == 0) {
+                  continue;
+               }
+            } catch (Exception var5) {
+               throw var5;
+            }
+
+            int var4 = ap.c;
+            ++var4;
+            ap.c = var4;
+         }
+
+         this.a.clear();
+         break;
+      }
+
+   }
+}
diff --git a/testData/obfuscated/ac.java b/testData/obfuscated/ac.java
new file mode 100644
index 0000000..b9054d9
--- /dev/null
+++ b/testData/obfuscated/ac.java
@@ -0,0 +1,3 @@
+public interface ac {
+   void a() throws Exception;
+}
diff --git a/testData/obfuscated/ad.java b/testData/obfuscated/ad.java
new file mode 100644
index 0000000..08b141e
--- /dev/null
+++ b/testData/obfuscated/ad.java
@@ -0,0 +1,3 @@
+public interface ad {
+   String a();
+}
diff --git a/testData/obfuscated/ae.java b/testData/obfuscated/ae.java
new file mode 100644
index 0000000..4dd6fc4
--- /dev/null
+++ b/testData/obfuscated/ae.java
@@ -0,0 +1,51 @@
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Timer;
+import java.util.concurrent.locks.ReentrantLock;
+
+@aa(
+   a = {ad.class}
+)
+public class ae implements ad {
+   @x(
+      a = ac.class
+   )
+   private List<ac> a;
+   private long b = 0L;
+   private Timer c;
+   private ReentrantLock d = new ReentrantLock();
+   public static boolean e;
+
+   public ae() {
+      this.a();
+   }
+
+   public void a() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public void b() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public String a() {
+      try {
+         if (this.b == 0L) {
+            return "-";
+         }
+      } catch (a_ var1) {
+         throw var1;
+      }
+
+      return DateFormat.getDateTimeInstance().format(new Date(this.b));
+   }
+
+   static List a(ae var0) {
+      return var0.a;
+   }
+
+   static long a(ae var0, long var1) {
+      return var0.b = var1;
+   }
+}
diff --git a/testData/obfuscated/af.java b/testData/obfuscated/af.java
new file mode 100644
index 0000000..0326ac8
--- /dev/null
+++ b/testData/obfuscated/af.java
@@ -0,0 +1,3 @@
+// $FF: synthetic class
+class af {
+}
diff --git a/testData/obfuscated/ag.java b/testData/obfuscated/ag.java
new file mode 100644
index 0000000..73eb9ae
--- /dev/null
+++ b/testData/obfuscated/ag.java
@@ -0,0 +1,32 @@
+public class ag {
+   private long a = 0L;
+   private long[] b = new long[100];
+   private int c = 0;
+   private int d = 0;
+
+   public void a(long param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public double a() {
+      try {
+         if (this.d == 0) {
+            return 0.0D;
+         }
+      } catch (a_ var4) {
+         throw var4;
+      }
+
+      double var1 = 0.0D;
+
+      for(int var3 = 0; var3 <= this.d; ++var3) {
+         var1 += (double)this.b[var3];
+      }
+
+      return var1 / (double)this.d;
+   }
+
+   public long b() {
+      return this.a;
+   }
+}
diff --git a/testData/obfuscated/ah.java b/testData/obfuscated/ah.java
new file mode 100644
index 0000000..f18b012
--- /dev/null
+++ b/testData/obfuscated/ah.java
@@ -0,0 +1,28 @@
+import java.util.concurrent.TimeUnit;
+
+public class ah {
+   private volatile long a = -1L;
+   private volatile long b = 0L;
+
+   public void a() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public double a(TimeUnit var1) {
+      return (double)(this.b / this.b(var1));
+   }
+
+   public long b() {
+      return this.b;
+   }
+
+   public long b(TimeUnit var1) {
+      long var2 = System.currentTimeMillis() - this.a;
+      return TimeUnit.MILLISECONDS.convert(var2, var1);
+   }
+
+   public void c() {
+      this.a = System.currentTimeMillis();
+      this.b = 0L;
+   }
+}
diff --git a/testData/obfuscated/ai.java b/testData/obfuscated/ai.java
new file mode 100644
index 0000000..b6b3516
--- /dev/null
+++ b/testData/obfuscated/ai.java
@@ -0,0 +1,39 @@
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@aa(
+   a = {ac.class, ai.class}
+)
+public class ai implements ac {
+   @x(
+      a = am.class
+   )
+   private List<am> a;
+   private static Map<ak, al> b = Collections.synchronizedMap(new LinkedHashMap());
+
+   public void a() throws Exception {
+      boolean var3 = an.k;
+      Iterator var1 = this.a.iterator();
+
+      while(var1.hasNext()) {
+         am var2 = (am)var1.next();
+         var2.a(new j(this));
+         if (var3) {
+            break;
+         }
+      }
+
+   }
+
+   public Collection<al> a() {
+      return b.values();
+   }
+
+   static Map b() {
+      return b;
+   }
+}
diff --git a/testData/obfuscated/aj.java b/testData/obfuscated/aj.java
new file mode 100644
index 0000000..f0d84c1
--- /dev/null
+++ b/testData/obfuscated/aj.java
@@ -0,0 +1,8595 @@
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@aa(
+   a = {am.class}
+)
+public class aj implements am {
+   private static final Pattern a;
+   private Map<String, Long> b;
+   private long c;
+   private Map<String, n<Long, Long>> d;
+   private long e;
+   private static final long f = 10L;
+   private static final Pattern g;
+   private static final String[] h;
+
+   private Map<String, Long> a() throws IOException {
+      LinkedHashMap var1 = new LinkedHashMap();
+      File var2 = new File(h[2]);
+
+      try {
+         if (!var2.exists()) {
+            return var1;
+         }
+      } catch (IOException var12) {
+         throw var12;
+      }
+
+      BufferedReader var3 = new BufferedReader(new FileReader(var2));
+
+      try {
+         for(String var4 = var3.readLine(); var4 != null; var4 = var3.readLine()) {
+            Matcher var5 = a.matcher(var4);
+
+            try {
+               if (var5.matches()) {
+                  var1.put(var5.group(1), Long.parseLong(var5.group(2)));
+               }
+            } catch (IOException var10) {
+               throw var10;
+            }
+         }
+      } finally {
+         var3.close();
+      }
+
+      return var1;
+   }
+
+   private Map<String, n<Long, Long>> b() throws IOException {
+      LinkedHashMap var1 = new LinkedHashMap();
+      File var2 = new File(h[0]);
+
+      try {
+         if (!var2.exists()) {
+            return var1;
+         }
+      } catch (IOException var12) {
+         throw var12;
+      }
+
+      BufferedReader var3 = new BufferedReader(new FileReader(var2));
+
+      try {
+         for(String var4 = var3.readLine(); var4 != null; var4 = var3.readLine()) {
+            Matcher var5 = g.matcher(var4);
+
+            try {
+               if (var5.matches()) {
+                  var1.put(var5.group(1), new n(Long.parseLong(var5.group(2)), Long.parseLong(var5.group(3))));
+               }
+            } catch (IOException var10) {
+               throw var10;
+            }
+         }
+      } finally {
+         var3.close();
+      }
+
+      return var1;
+   }
+
+   public void a(k<ak> var1) {
+      this.b(var1);
+      this.c(var1);
+   }
+
+   protected void b(k<ak> var1) {
+      try {
+         Map var2 = this.a();
+         long var3 = System.currentTimeMillis() - this.c;
+         this.c = System.currentTimeMillis();
+         if (this.b != null) {
+            Iterator var5 = var2.entrySet().iterator();
+
+            while(var5.hasNext()) {
+               Entry var6 = (Entry)var5.next();
+               Long var7 = (Long)this.b.get(var6.getKey());
+               if (var7 != null) {
+                  double var8 = (double)(((Long)var6.getValue() - var7) * 10L) / (double)var3;
+                  var1.a((Object)(new ar(h[1], (String)var6.getKey(), "%", var8 * 100.0D)));
+               }
+            }
+         }
+
+         this.b = var2;
+      } catch (IOException var10) {
+         var10.printStackTrace();
+      }
+
+   }
+
+   protected void c(k<ak> param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   static {
+      String[] var10000 = new String[9];
+      char[] var10003 = "h!\"+hh597`4%10x".toCharArray();
+      int var10005 = var10003.length;
+      int var1 = 0;
+      char[] var10004 = var10003;
+      int var6 = var10005;
+      char[] var2;
+      int var3;
+      char[] var5;
+      char[] var8;
+      char var9;
+      byte var10;
+      char[] var10001;
+      int var10002;
+      int var10006;
+      char var10007;
+      byte var10008;
+      if (var10005 <= 1) {
+         var8 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 71;
+            break;
+         case 1:
+            var10008 = 81;
+            break;
+         case 2:
+            var10008 = 80;
+            break;
+         case 3:
+            var10008 = 68;
+            break;
+         default:
+            var10008 = 11;
+         }
+      } else {
+         var10004 = var10003;
+         var6 = var10005;
+         if (var10005 <= var1) {
+            label3117: {
+               var10000[0] = (new String(var10003)).intern();
+               var10003 = "\u0014\b\u0003".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var6 = var10005;
+               if (var10005 <= 1) {
+                  var8 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var6 = var10005;
+                  if (var10005 <= var1) {
+                     break label3117;
+                  }
+
+                  var8 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var8[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 71;
+                     break;
+                  case 1:
+                     var10008 = 81;
+                     break;
+                  case 2:
+                     var10008 = 80;
+                     break;
+                  case 3:
+                     var10008 = 68;
+                     break;
+                  default:
+                     var10008 = 11;
+                  }
+
+                  var8[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var6 == 0) {
+                     var10006 = var6;
+                     var8 = var10004;
+                  } else {
+                     if (var6 <= var1) {
+                        break;
+                     }
+
+                     var8 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[1] = (new String(var10004)).intern();
+            var10003 = "h!\"+hh\"$%\u007f".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var6 = var10005;
+            if (var10005 <= 1) {
+               var8 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 71;
+                  break;
+               case 1:
+                  var10008 = 81;
+                  break;
+               case 2:
+                  var10008 = 80;
+                  break;
+               case 3:
+                  var10008 = 68;
+                  break;
+               default:
+                  var10008 = 11;
+               }
+            } else {
+               var10004 = var10003;
+               var6 = var10005;
+               if (var10005 <= var1) {
+                  label3185: {
+                     var10000[2] = (new String(var10003)).intern();
+                     var10003 = "j#5%o4".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var6 = var10005;
+                     if (var10005 <= 1) {
+                        var8 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= var1) {
+                           break label3185;
+                        }
+
+                        var8 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var8[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 71;
+                           break;
+                        case 1:
+                           var10008 = 81;
+                           break;
+                        case 2:
+                           var10008 = 80;
+                           break;
+                        case 3:
+                           var10008 = 68;
+                           break;
+                        default:
+                           var10008 = 11;
+                        }
+
+                        var8[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var6 == 0) {
+                           var10006 = var6;
+                           var8 = var10004;
+                        } else {
+                           if (var6 <= var1) {
+                              break;
+                           }
+
+                           var8 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[3] = (new String(var10004)).intern();
+                  var10003 = "v~#".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var6 = var10005;
+                  if (var10005 <= 1) {
+                     var8 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 71;
+                        break;
+                     case 1:
+                        var10008 = 81;
+                        break;
+                     case 2:
+                        var10008 = 80;
+                        break;
+                     case 3:
+                        var10008 = 68;
+                        break;
+                     default:
+                        var10008 = 11;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var6 = var10005;
+                     if (var10005 <= var1) {
+                        label3253: {
+                           var10000[4] = (new String(var10003)).intern();
+                           var10003 = "j&\"-\u007f\"\"".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= 1) {
+                              var8 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= var1) {
+                                 break label3253;
+                              }
+
+                              var8 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var8[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 71;
+                                 break;
+                              case 1:
+                                 var10008 = 81;
+                                 break;
+                              case 2:
+                                 var10008 = 80;
+                                 break;
+                              case 3:
+                                 var10008 = 68;
+                                 break;
+                              default:
+                                 var10008 = 11;
+                              }
+
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                              } else {
+                                 if (var6 <= var1) {
+                                    break;
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[5] = (new String(var10004)).intern();
+                        var10003 = "\u0014\b\u0003".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= 1) {
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        } else {
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= var1) {
+                              label3321: {
+                                 var10000[6] = (new String(var10003)).intern();
+                                 var10003 = "v~#".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label3321;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 71;
+                                       break;
+                                    case 1:
+                                       var10008 = 81;
+                                       break;
+                                    case 2:
+                                       var10008 = 80;
+                                       break;
+                                    case 3:
+                                       var10008 = 68;
+                                       break;
+                                    default:
+                                       var10008 = 11;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[7] = (new String(var10004)).intern();
+                              var10003 = "\u0014\b\u0003".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= 1) {
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              } else {
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= var1) {
+                                    label3389: {
+                                       var10000[8] = (new String(var10003)).intern();
+                                       h = var10000;
+                                       var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                       var10002 = var2.length;
+                                       var1 = 0;
+                                       var10001 = var2;
+                                       var3 = var10002;
+                                       if (var10002 <= 1) {
+                                          var5 = var2;
+                                          var6 = var1;
+                                       } else {
+                                          var10001 = var2;
+                                          var3 = var10002;
+                                          if (var10002 <= var1) {
+                                             break label3389;
+                                          }
+
+                                          var5 = var2;
+                                          var6 = var1;
+                                       }
+
+                                       while(true) {
+                                          var9 = var5[var6];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10 = 71;
+                                             break;
+                                          case 1:
+                                             var10 = 81;
+                                             break;
+                                          case 2:
+                                             var10 = 80;
+                                             break;
+                                          case 3:
+                                             var10 = 68;
+                                             break;
+                                          default:
+                                             var10 = 11;
+                                          }
+
+                                          var5[var6] = (char)(var9 ^ var10);
+                                          ++var1;
+                                          if (var3 == 0) {
+                                             var6 = var3;
+                                             var5 = var10001;
+                                          } else {
+                                             if (var3 <= var1) {
+                                                break;
+                                             }
+
+                                             var5 = var10001;
+                                             var6 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    a = Pattern.compile((new String(var10001)).intern());
+                                    var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                    var10002 = var2.length;
+                                    var1 = 0;
+                                    var10001 = var2;
+                                    var3 = var10002;
+                                    if (var10002 <= 1) {
+                                       var5 = var2;
+                                       var6 = var1;
+                                    } else {
+                                       var10001 = var2;
+                                       var3 = var10002;
+                                       if (var10002 <= var1) {
+                                          g = Pattern.compile((new String(var2)).intern());
+                                          return;
+                                       }
+
+                                       var5 = var2;
+                                       var6 = var1;
+                                    }
+
+                                    while(true) {
+                                       var9 = var5[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10 = 71;
+                                          break;
+                                       case 1:
+                                          var10 = 81;
+                                          break;
+                                       case 2:
+                                          var10 = 80;
+                                          break;
+                                       case 3:
+                                          var10 = 68;
+                                          break;
+                                       default:
+                                          var10 = 11;
+                                       }
+
+                                       var5[var6] = (char)(var9 ^ var10);
+                                       ++var1;
+                                       if (var3 == 0) {
+                                          var6 = var3;
+                                          var5 = var10001;
+                                       } else {
+                                          if (var3 <= var1) {
+                                             g = Pattern.compile((new String(var10001)).intern());
+                                             return;
+                                          }
+
+                                          var5 = var10001;
+                                          var6 = var1;
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              }
+
+                              while(true) {
+                                 while(true) {
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                       var10007 = var10004[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       if (var6 <= var1) {
+                                          label3497: {
+                                             var10000[8] = (new String(var10004)).intern();
+                                             h = var10000;
+                                             var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                             var10002 = var2.length;
+                                             var1 = 0;
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= 1) {
+                                                var5 = var2;
+                                                var6 = var1;
+                                             } else {
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= var1) {
+                                                   break label3497;
+                                                }
+
+                                                var5 = var2;
+                                                var6 = var1;
+                                             }
+
+                                             while(true) {
+                                                var9 = var5[var6];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10 = 68;
+                                                   break;
+                                                default:
+                                                   var10 = 11;
+                                                }
+
+                                                var5[var6] = (char)(var9 ^ var10);
+                                                ++var1;
+                                                if (var3 == 0) {
+                                                   var6 = var3;
+                                                   var5 = var10001;
+                                                } else {
+                                                   if (var3 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var5 = var10001;
+                                                   var6 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          a = Pattern.compile((new String(var10001)).intern());
+                                          var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                          var10002 = var2.length;
+                                          var1 = 0;
+                                          var10001 = var2;
+                                          var3 = var10002;
+                                          if (var10002 <= 1) {
+                                             var5 = var2;
+                                             var6 = var1;
+                                          } else {
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= var1) {
+                                                g = Pattern.compile((new String(var2)).intern());
+                                                return;
+                                             }
+
+                                             var5 = var2;
+                                             var6 = var1;
+                                          }
+
+                                          while(true) {
+                                             var9 = var5[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10 = 71;
+                                                break;
+                                             case 1:
+                                                var10 = 81;
+                                                break;
+                                             case 2:
+                                                var10 = 80;
+                                                break;
+                                             case 3:
+                                                var10 = 68;
+                                                break;
+                                             default:
+                                                var10 = 11;
+                                             }
+
+                                             var5[var6] = (char)(var9 ^ var10);
+                                             ++var1;
+                                             if (var3 == 0) {
+                                                var6 = var3;
+                                                var5 = var10001;
+                                             } else {
+                                                if (var3 <= var1) {
+                                                   g = Pattern.compile((new String(var10001)).intern());
+                                                   return;
+                                                }
+
+                                                var5 = var10001;
+                                                var6 = var1;
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                       var10007 = var10004[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+                                 }
+                              }
+                           }
+
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        }
+
+                        while(true) {
+                           while(true) {
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                                 var10007 = var10004[var6];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              } else {
+                                 if (var6 <= var1) {
+                                    label3632: {
+                                       var10000[6] = (new String(var10004)).intern();
+                                       var10003 = "v~#".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label3632;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 71;
+                                             break;
+                                          case 1:
+                                             var10008 = 81;
+                                             break;
+                                          case 2:
+                                             var10008 = 80;
+                                             break;
+                                          case 3:
+                                             var10008 = 68;
+                                             break;
+                                          default:
+                                             var10008 = 11;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[7] = (new String(var10004)).intern();
+                                    var10003 = "\u0014\b\u0003".toCharArray();
+                                    var10005 = var10003.length;
+                                    var1 = 0;
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= 1) {
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= var1) {
+                                          label3700: {
+                                             var10000[8] = (new String(var10003)).intern();
+                                             h = var10000;
+                                             var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                             var10002 = var2.length;
+                                             var1 = 0;
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= 1) {
+                                                var5 = var2;
+                                                var6 = var1;
+                                             } else {
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= var1) {
+                                                   break label3700;
+                                                }
+
+                                                var5 = var2;
+                                                var6 = var1;
+                                             }
+
+                                             while(true) {
+                                                var9 = var5[var6];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10 = 68;
+                                                   break;
+                                                default:
+                                                   var10 = 11;
+                                                }
+
+                                                var5[var6] = (char)(var9 ^ var10);
+                                                ++var1;
+                                                if (var3 == 0) {
+                                                   var6 = var3;
+                                                   var5 = var10001;
+                                                } else {
+                                                   if (var3 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var5 = var10001;
+                                                   var6 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          a = Pattern.compile((new String(var10001)).intern());
+                                          var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                          var10002 = var2.length;
+                                          var1 = 0;
+                                          var10001 = var2;
+                                          var3 = var10002;
+                                          if (var10002 <= 1) {
+                                             var5 = var2;
+                                             var6 = var1;
+                                          } else {
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= var1) {
+                                                g = Pattern.compile((new String(var2)).intern());
+                                                return;
+                                             }
+
+                                             var5 = var2;
+                                             var6 = var1;
+                                          }
+
+                                          while(true) {
+                                             var9 = var5[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10 = 71;
+                                                break;
+                                             case 1:
+                                                var10 = 81;
+                                                break;
+                                             case 2:
+                                                var10 = 80;
+                                                break;
+                                             case 3:
+                                                var10 = 68;
+                                                break;
+                                             default:
+                                                var10 = 11;
+                                             }
+
+                                             var5[var6] = (char)(var9 ^ var10);
+                                             ++var1;
+                                             if (var3 == 0) {
+                                                var6 = var3;
+                                                var5 = var10001;
+                                             } else {
+                                                if (var3 <= var1) {
+                                                   g = Pattern.compile((new String(var10001)).intern());
+                                                   return;
+                                                }
+
+                                                var5 = var10001;
+                                                var6 = var1;
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+
+                                    while(true) {
+                                       while(true) {
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                             var10007 = var10004[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             if (var6 <= var1) {
+                                                label3808: {
+                                                   var10000[8] = (new String(var10004)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label3808;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                             var10007 = var10004[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                                 var10007 = var10004[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              }
+                           }
+                        }
+                     }
+
+                     var8 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 71;
+                        break;
+                     case 1:
+                        var10008 = 81;
+                        break;
+                     case 2:
+                        var10008 = 80;
+                        break;
+                     case 3:
+                        var10008 = 68;
+                        break;
+                     default:
+                        var10008 = 11;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var8[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var6 == 0) {
+                           var10006 = var6;
+                           var8 = var10004;
+                           var10007 = var10004[var6];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        } else {
+                           if (var6 <= var1) {
+                              label3970: {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 var10003 = "j&\"-\u007f\"\"".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label3970;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 71;
+                                       break;
+                                    case 1:
+                                       var10008 = 81;
+                                       break;
+                                    case 2:
+                                       var10008 = 80;
+                                       break;
+                                    case 3:
+                                       var10008 = 68;
+                                       break;
+                                    default:
+                                       var10008 = 11;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[5] = (new String(var10004)).intern();
+                              var10003 = "\u0014\b\u0003".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= 1) {
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              } else {
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= var1) {
+                                    label4038: {
+                                       var10000[6] = (new String(var10003)).intern();
+                                       var10003 = "v~#".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label4038;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 71;
+                                             break;
+                                          case 1:
+                                             var10008 = 81;
+                                             break;
+                                          case 2:
+                                             var10008 = 80;
+                                             break;
+                                          case 3:
+                                             var10008 = 68;
+                                             break;
+                                          default:
+                                             var10008 = 11;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[7] = (new String(var10004)).intern();
+                                    var10003 = "\u0014\b\u0003".toCharArray();
+                                    var10005 = var10003.length;
+                                    var1 = 0;
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= 1) {
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= var1) {
+                                          label4106: {
+                                             var10000[8] = (new String(var10003)).intern();
+                                             h = var10000;
+                                             var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                             var10002 = var2.length;
+                                             var1 = 0;
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= 1) {
+                                                var5 = var2;
+                                                var6 = var1;
+                                             } else {
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= var1) {
+                                                   break label4106;
+                                                }
+
+                                                var5 = var2;
+                                                var6 = var1;
+                                             }
+
+                                             while(true) {
+                                                var9 = var5[var6];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10 = 68;
+                                                   break;
+                                                default:
+                                                   var10 = 11;
+                                                }
+
+                                                var5[var6] = (char)(var9 ^ var10);
+                                                ++var1;
+                                                if (var3 == 0) {
+                                                   var6 = var3;
+                                                   var5 = var10001;
+                                                } else {
+                                                   if (var3 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var5 = var10001;
+                                                   var6 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          a = Pattern.compile((new String(var10001)).intern());
+                                          var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                          var10002 = var2.length;
+                                          var1 = 0;
+                                          var10001 = var2;
+                                          var3 = var10002;
+                                          if (var10002 <= 1) {
+                                             var5 = var2;
+                                             var6 = var1;
+                                          } else {
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= var1) {
+                                                g = Pattern.compile((new String(var2)).intern());
+                                                return;
+                                             }
+
+                                             var5 = var2;
+                                             var6 = var1;
+                                          }
+
+                                          while(true) {
+                                             var9 = var5[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10 = 71;
+                                                break;
+                                             case 1:
+                                                var10 = 81;
+                                                break;
+                                             case 2:
+                                                var10 = 80;
+                                                break;
+                                             case 3:
+                                                var10 = 68;
+                                                break;
+                                             default:
+                                                var10 = 11;
+                                             }
+
+                                             var5[var6] = (char)(var9 ^ var10);
+                                             ++var1;
+                                             if (var3 == 0) {
+                                                var6 = var3;
+                                                var5 = var10001;
+                                             } else {
+                                                if (var3 <= var1) {
+                                                   g = Pattern.compile((new String(var10001)).intern());
+                                                   return;
+                                                }
+
+                                                var5 = var10001;
+                                                var6 = var1;
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+
+                                    while(true) {
+                                       while(true) {
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                             var10007 = var10004[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             if (var6 <= var1) {
+                                                label4214: {
+                                                   var10000[8] = (new String(var10004)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label4214;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                             var10007 = var10004[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              }
+
+                              while(true) {
+                                 while(true) {
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                       var10007 = var10004[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       if (var6 <= var1) {
+                                          label4349: {
+                                             var10000[6] = (new String(var10004)).intern();
+                                             var10003 = "v~#".toCharArray();
+                                             var10005 = var10003.length;
+                                             var1 = 0;
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= 1) {
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             } else {
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= var1) {
+                                                   break label4349;
+                                                }
+
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             }
+
+                                             while(true) {
+                                                var10007 = var8[var10006];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10008 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10008 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10008 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10008 = 68;
+                                                   break;
+                                                default:
+                                                   var10008 = 11;
+                                                }
+
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          var10000[7] = (new String(var10004)).intern();
+                                          var10003 = "\u0014\b\u0003".toCharArray();
+                                          var10005 = var10003.length;
+                                          var1 = 0;
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= 1) {
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= var1) {
+                                                label4417: {
+                                                   var10000[8] = (new String(var10003)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label4417;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+
+                                          while(true) {
+                                             while(true) {
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                   var10007 = var10004[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      label4525: {
+                                                         var10000[8] = (new String(var10004)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label4525;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                   var10007 = var10004[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                       var10007 = var10004[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+                                 }
+                              }
+                           }
+
+                           var8 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var8 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 71;
+                  break;
+               case 1:
+                  var10008 = 81;
+                  break;
+               case 2:
+                  var10008 = 80;
+                  break;
+               case 3:
+                  var10008 = 68;
+                  break;
+               default:
+                  var10008 = 11;
+               }
+            }
+
+            while(true) {
+               while(true) {
+                  var8[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var6 == 0) {
+                     var10006 = var6;
+                     var8 = var10004;
+                     var10007 = var10004[var6];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 71;
+                        break;
+                     case 1:
+                        var10008 = 81;
+                        break;
+                     case 2:
+                        var10008 = 80;
+                        break;
+                     case 3:
+                        var10008 = 68;
+                        break;
+                     default:
+                        var10008 = 11;
+                     }
+                  } else {
+                     if (var6 <= var1) {
+                        label4714: {
+                           var10000[2] = (new String(var10004)).intern();
+                           var10003 = "j#5%o4".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= 1) {
+                              var8 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= var1) {
+                                 break label4714;
+                              }
+
+                              var8 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var8[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 71;
+                                 break;
+                              case 1:
+                                 var10008 = 81;
+                                 break;
+                              case 2:
+                                 var10008 = 80;
+                                 break;
+                              case 3:
+                                 var10008 = 68;
+                                 break;
+                              default:
+                                 var10008 = 11;
+                              }
+
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                              } else {
+                                 if (var6 <= var1) {
+                                    break;
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "v~#".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= 1) {
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        } else {
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= var1) {
+                              label4782: {
+                                 var10000[4] = (new String(var10003)).intern();
+                                 var10003 = "j&\"-\u007f\"\"".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label4782;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 71;
+                                       break;
+                                    case 1:
+                                       var10008 = 81;
+                                       break;
+                                    case 2:
+                                       var10008 = 80;
+                                       break;
+                                    case 3:
+                                       var10008 = 68;
+                                       break;
+                                    default:
+                                       var10008 = 11;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[5] = (new String(var10004)).intern();
+                              var10003 = "\u0014\b\u0003".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= 1) {
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              } else {
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= var1) {
+                                    label4850: {
+                                       var10000[6] = (new String(var10003)).intern();
+                                       var10003 = "v~#".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label4850;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 71;
+                                             break;
+                                          case 1:
+                                             var10008 = 81;
+                                             break;
+                                          case 2:
+                                             var10008 = 80;
+                                             break;
+                                          case 3:
+                                             var10008 = 68;
+                                             break;
+                                          default:
+                                             var10008 = 11;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[7] = (new String(var10004)).intern();
+                                    var10003 = "\u0014\b\u0003".toCharArray();
+                                    var10005 = var10003.length;
+                                    var1 = 0;
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= 1) {
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= var1) {
+                                          label4918: {
+                                             var10000[8] = (new String(var10003)).intern();
+                                             h = var10000;
+                                             var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                             var10002 = var2.length;
+                                             var1 = 0;
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= 1) {
+                                                var5 = var2;
+                                                var6 = var1;
+                                             } else {
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= var1) {
+                                                   break label4918;
+                                                }
+
+                                                var5 = var2;
+                                                var6 = var1;
+                                             }
+
+                                             while(true) {
+                                                var9 = var5[var6];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10 = 68;
+                                                   break;
+                                                default:
+                                                   var10 = 11;
+                                                }
+
+                                                var5[var6] = (char)(var9 ^ var10);
+                                                ++var1;
+                                                if (var3 == 0) {
+                                                   var6 = var3;
+                                                   var5 = var10001;
+                                                } else {
+                                                   if (var3 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var5 = var10001;
+                                                   var6 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          a = Pattern.compile((new String(var10001)).intern());
+                                          var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                          var10002 = var2.length;
+                                          var1 = 0;
+                                          var10001 = var2;
+                                          var3 = var10002;
+                                          if (var10002 <= 1) {
+                                             var5 = var2;
+                                             var6 = var1;
+                                          } else {
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= var1) {
+                                                g = Pattern.compile((new String(var2)).intern());
+                                                return;
+                                             }
+
+                                             var5 = var2;
+                                             var6 = var1;
+                                          }
+
+                                          while(true) {
+                                             var9 = var5[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10 = 71;
+                                                break;
+                                             case 1:
+                                                var10 = 81;
+                                                break;
+                                             case 2:
+                                                var10 = 80;
+                                                break;
+                                             case 3:
+                                                var10 = 68;
+                                                break;
+                                             default:
+                                                var10 = 11;
+                                             }
+
+                                             var5[var6] = (char)(var9 ^ var10);
+                                             ++var1;
+                                             if (var3 == 0) {
+                                                var6 = var3;
+                                                var5 = var10001;
+                                             } else {
+                                                if (var3 <= var1) {
+                                                   g = Pattern.compile((new String(var10001)).intern());
+                                                   return;
+                                                }
+
+                                                var5 = var10001;
+                                                var6 = var1;
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+
+                                    while(true) {
+                                       while(true) {
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                             var10007 = var10004[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             if (var6 <= var1) {
+                                                label5026: {
+                                                   var10000[8] = (new String(var10004)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label5026;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                             var10007 = var10004[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              }
+
+                              while(true) {
+                                 while(true) {
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                       var10007 = var10004[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       if (var6 <= var1) {
+                                          label5161: {
+                                             var10000[6] = (new String(var10004)).intern();
+                                             var10003 = "v~#".toCharArray();
+                                             var10005 = var10003.length;
+                                             var1 = 0;
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= 1) {
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             } else {
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= var1) {
+                                                   break label5161;
+                                                }
+
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             }
+
+                                             while(true) {
+                                                var10007 = var8[var10006];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10008 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10008 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10008 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10008 = 68;
+                                                   break;
+                                                default:
+                                                   var10008 = 11;
+                                                }
+
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          var10000[7] = (new String(var10004)).intern();
+                                          var10003 = "\u0014\b\u0003".toCharArray();
+                                          var10005 = var10003.length;
+                                          var1 = 0;
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= 1) {
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= var1) {
+                                                label5229: {
+                                                   var10000[8] = (new String(var10003)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label5229;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+
+                                          while(true) {
+                                             while(true) {
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                   var10007 = var10004[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      label5337: {
+                                                         var10000[8] = (new String(var10004)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label5337;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                   var10007 = var10004[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                       var10007 = var10004[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+                                 }
+                              }
+                           }
+
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        }
+
+                        while(true) {
+                           while(true) {
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                                 var10007 = var10004[var6];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              } else {
+                                 if (var6 <= var1) {
+                                    label5499: {
+                                       var10000[4] = (new String(var10004)).intern();
+                                       var10003 = "j&\"-\u007f\"\"".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label5499;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 71;
+                                             break;
+                                          case 1:
+                                             var10008 = 81;
+                                             break;
+                                          case 2:
+                                             var10008 = 80;
+                                             break;
+                                          case 3:
+                                             var10008 = 68;
+                                             break;
+                                          default:
+                                             var10008 = 11;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[5] = (new String(var10004)).intern();
+                                    var10003 = "\u0014\b\u0003".toCharArray();
+                                    var10005 = var10003.length;
+                                    var1 = 0;
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= 1) {
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= var1) {
+                                          label5567: {
+                                             var10000[6] = (new String(var10003)).intern();
+                                             var10003 = "v~#".toCharArray();
+                                             var10005 = var10003.length;
+                                             var1 = 0;
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= 1) {
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             } else {
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= var1) {
+                                                   break label5567;
+                                                }
+
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             }
+
+                                             while(true) {
+                                                var10007 = var8[var10006];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10008 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10008 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10008 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10008 = 68;
+                                                   break;
+                                                default:
+                                                   var10008 = 11;
+                                                }
+
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          var10000[7] = (new String(var10004)).intern();
+                                          var10003 = "\u0014\b\u0003".toCharArray();
+                                          var10005 = var10003.length;
+                                          var1 = 0;
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= 1) {
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= var1) {
+                                                label5635: {
+                                                   var10000[8] = (new String(var10003)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label5635;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+
+                                          while(true) {
+                                             while(true) {
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                   var10007 = var10004[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      label5743: {
+                                                         var10000[8] = (new String(var10004)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label5743;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                   var10007 = var10004[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+
+                                    while(true) {
+                                       while(true) {
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                             var10007 = var10004[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             if (var6 <= var1) {
+                                                label5878: {
+                                                   var10000[6] = (new String(var10004)).intern();
+                                                   var10003 = "v~#".toCharArray();
+                                                   var10005 = var10003.length;
+                                                   var1 = 0;
+                                                   var10004 = var10003;
+                                                   var6 = var10005;
+                                                   if (var10005 <= 1) {
+                                                      var8 = var10003;
+                                                      var10006 = var1;
+                                                   } else {
+                                                      var10004 = var10003;
+                                                      var6 = var10005;
+                                                      if (var10005 <= var1) {
+                                                         break label5878;
+                                                      }
+
+                                                      var8 = var10003;
+                                                      var10006 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var10007 = var8[var10006];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10008 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10008 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10008 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10008 = 68;
+                                                         break;
+                                                      default:
+                                                         var10008 = 11;
+                                                      }
+
+                                                      var8[var10006] = (char)(var10007 ^ var10008);
+                                                      ++var1;
+                                                      if (var6 == 0) {
+                                                         var10006 = var6;
+                                                         var8 = var10004;
+                                                      } else {
+                                                         if (var6 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var8 = var10004;
+                                                         var10006 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                var10000[7] = (new String(var10004)).intern();
+                                                var10003 = "\u0014\b\u0003".toCharArray();
+                                                var10005 = var10003.length;
+                                                var1 = 0;
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= 1) {
+                                                   var8 = var10003;
+                                                   var10006 = var1;
+                                                   var10007 = var10003[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   var10004 = var10003;
+                                                   var6 = var10005;
+                                                   if (var10005 <= var1) {
+                                                      label5946: {
+                                                         var10000[8] = (new String(var10003)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label5946;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10003;
+                                                   var10006 = var1;
+                                                   var10007 = var10003[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+
+                                                while(true) {
+                                                   while(true) {
+                                                      var8[var10006] = (char)(var10007 ^ var10008);
+                                                      ++var1;
+                                                      if (var6 == 0) {
+                                                         var10006 = var6;
+                                                         var8 = var10004;
+                                                         var10007 = var10004[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      } else {
+                                                         if (var6 <= var1) {
+                                                            label6054: {
+                                                               var10000[8] = (new String(var10004)).intern();
+                                                               h = var10000;
+                                                               var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                               var10002 = var2.length;
+                                                               var1 = 0;
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= 1) {
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               } else {
+                                                                  var10001 = var2;
+                                                                  var3 = var10002;
+                                                                  if (var10002 <= var1) {
+                                                                     break label6054;
+                                                                  }
+
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               }
+
+                                                               while(true) {
+                                                                  var9 = var5[var6];
+                                                                  switch(var1 % 5) {
+                                                                  case 0:
+                                                                     var10 = 71;
+                                                                     break;
+                                                                  case 1:
+                                                                     var10 = 81;
+                                                                     break;
+                                                                  case 2:
+                                                                     var10 = 80;
+                                                                     break;
+                                                                  case 3:
+                                                                     var10 = 68;
+                                                                     break;
+                                                                  default:
+                                                                     var10 = 11;
+                                                                  }
+
+                                                                  var5[var6] = (char)(var9 ^ var10);
+                                                                  ++var1;
+                                                                  if (var3 == 0) {
+                                                                     var6 = var3;
+                                                                     var5 = var10001;
+                                                                  } else {
+                                                                     if (var3 <= var1) {
+                                                                        break;
+                                                                     }
+
+                                                                     var5 = var10001;
+                                                                     var6 = var1;
+                                                                  }
+                                                               }
+                                                            }
+
+                                                            a = Pattern.compile((new String(var10001)).intern());
+                                                            var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                            var10002 = var2.length;
+                                                            var1 = 0;
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= 1) {
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            } else {
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= var1) {
+                                                                  g = Pattern.compile((new String(var2)).intern());
+                                                                  return;
+                                                               }
+
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            }
+
+                                                            while(true) {
+                                                               var9 = var5[var6];
+                                                               switch(var1 % 5) {
+                                                               case 0:
+                                                                  var10 = 71;
+                                                                  break;
+                                                               case 1:
+                                                                  var10 = 81;
+                                                                  break;
+                                                               case 2:
+                                                                  var10 = 80;
+                                                                  break;
+                                                               case 3:
+                                                                  var10 = 68;
+                                                                  break;
+                                                               default:
+                                                                  var10 = 11;
+                                                               }
+
+                                                               var5[var6] = (char)(var9 ^ var10);
+                                                               ++var1;
+                                                               if (var3 == 0) {
+                                                                  var6 = var3;
+                                                                  var5 = var10001;
+                                                               } else {
+                                                                  if (var3 <= var1) {
+                                                                     g = Pattern.compile((new String(var10001)).intern());
+                                                                     return;
+                                                                  }
+
+                                                                  var5 = var10001;
+                                                                  var6 = var1;
+                                                               }
+                                                            }
+                                                         }
+
+                                                         var8 = var10004;
+                                                         var10006 = var1;
+                                                         var10007 = var10004[var1];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      }
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                             var10007 = var10004[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                                 var10007 = var10004[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              }
+                           }
+                        }
+                     }
+
+                     var8 = var10004;
+                     var10006 = var1;
+                     var10007 = var10004[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 71;
+                        break;
+                     case 1:
+                        var10008 = 81;
+                        break;
+                     case 2:
+                        var10008 = 80;
+                        break;
+                     case 3:
+                        var10008 = 68;
+                        break;
+                     default:
+                        var10008 = 11;
+                     }
+                  }
+               }
+            }
+         }
+
+         var8 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 71;
+            break;
+         case 1:
+            var10008 = 81;
+            break;
+         case 2:
+            var10008 = 80;
+            break;
+         case 3:
+            var10008 = 68;
+            break;
+         default:
+            var10008 = 11;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var8[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var6 == 0) {
+               var10006 = var6;
+               var8 = var10004;
+               var10007 = var10004[var6];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 71;
+                  break;
+               case 1:
+                  var10008 = 81;
+                  break;
+               case 2:
+                  var10008 = 80;
+                  break;
+               case 3:
+                  var10008 = 68;
+                  break;
+               default:
+                  var10008 = 11;
+               }
+            } else {
+               if (var6 <= var1) {
+                  label1509: {
+                     var10000[0] = (new String(var10004)).intern();
+                     var10003 = "\u0014\b\u0003".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var6 = var10005;
+                     if (var10005 <= 1) {
+                        var8 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= var1) {
+                           break label1509;
+                        }
+
+                        var8 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var8[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 71;
+                           break;
+                        case 1:
+                           var10008 = 81;
+                           break;
+                        case 2:
+                           var10008 = 80;
+                           break;
+                        case 3:
+                           var10008 = 68;
+                           break;
+                        default:
+                           var10008 = 11;
+                        }
+
+                        var8[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var6 == 0) {
+                           var10006 = var6;
+                           var8 = var10004;
+                        } else {
+                           if (var6 <= var1) {
+                              break;
+                           }
+
+                           var8 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[1] = (new String(var10004)).intern();
+                  var10003 = "h!\"+hh\"$%\u007f".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var6 = var10005;
+                  if (var10005 <= 1) {
+                     var8 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 71;
+                        break;
+                     case 1:
+                        var10008 = 81;
+                        break;
+                     case 2:
+                        var10008 = 80;
+                        break;
+                     case 3:
+                        var10008 = 68;
+                        break;
+                     default:
+                        var10008 = 11;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var6 = var10005;
+                     if (var10005 <= var1) {
+                        label1553: {
+                           var10000[2] = (new String(var10003)).intern();
+                           var10003 = "j#5%o4".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= 1) {
+                              var8 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= var1) {
+                                 break label1553;
+                              }
+
+                              var8 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var8[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 71;
+                                 break;
+                              case 1:
+                                 var10008 = 81;
+                                 break;
+                              case 2:
+                                 var10008 = 80;
+                                 break;
+                              case 3:
+                                 var10008 = 68;
+                                 break;
+                              default:
+                                 var10008 = 11;
+                              }
+
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                              } else {
+                                 if (var6 <= var1) {
+                                    break;
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "v~#".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var6 = var10005;
+                        if (var10005 <= 1) {
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        } else {
+                           var10004 = var10003;
+                           var6 = var10005;
+                           if (var10005 <= var1) {
+                              label1621: {
+                                 var10000[4] = (new String(var10003)).intern();
+                                 var10003 = "j&\"-\u007f\"\"".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label1621;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 71;
+                                       break;
+                                    case 1:
+                                       var10008 = 81;
+                                       break;
+                                    case 2:
+                                       var10008 = 80;
+                                       break;
+                                    case 3:
+                                       var10008 = 68;
+                                       break;
+                                    default:
+                                       var10008 = 11;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[5] = (new String(var10004)).intern();
+                              var10003 = "\u0014\b\u0003".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= 1) {
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              } else {
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= var1) {
+                                    label1689: {
+                                       var10000[6] = (new String(var10003)).intern();
+                                       var10003 = "v~#".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label1689;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 71;
+                                             break;
+                                          case 1:
+                                             var10008 = 81;
+                                             break;
+                                          case 2:
+                                             var10008 = 80;
+                                             break;
+                                          case 3:
+                                             var10008 = 68;
+                                             break;
+                                          default:
+                                             var10008 = 11;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[7] = (new String(var10004)).intern();
+                                    var10003 = "\u0014\b\u0003".toCharArray();
+                                    var10005 = var10003.length;
+                                    var1 = 0;
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= 1) {
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= var1) {
+                                          label1757: {
+                                             var10000[8] = (new String(var10003)).intern();
+                                             h = var10000;
+                                             var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                             var10002 = var2.length;
+                                             var1 = 0;
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= 1) {
+                                                var5 = var2;
+                                                var6 = var1;
+                                             } else {
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= var1) {
+                                                   break label1757;
+                                                }
+
+                                                var5 = var2;
+                                                var6 = var1;
+                                             }
+
+                                             while(true) {
+                                                var9 = var5[var6];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10 = 68;
+                                                   break;
+                                                default:
+                                                   var10 = 11;
+                                                }
+
+                                                var5[var6] = (char)(var9 ^ var10);
+                                                ++var1;
+                                                if (var3 == 0) {
+                                                   var6 = var3;
+                                                   var5 = var10001;
+                                                } else {
+                                                   if (var3 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var5 = var10001;
+                                                   var6 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          a = Pattern.compile((new String(var10001)).intern());
+                                          var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                          var10002 = var2.length;
+                                          var1 = 0;
+                                          var10001 = var2;
+                                          var3 = var10002;
+                                          if (var10002 <= 1) {
+                                             var5 = var2;
+                                             var6 = var1;
+                                          } else {
+                                             var10001 = var2;
+                                             var3 = var10002;
+                                             if (var10002 <= var1) {
+                                                g = Pattern.compile((new String(var2)).intern());
+                                                return;
+                                             }
+
+                                             var5 = var2;
+                                             var6 = var1;
+                                          }
+
+                                          while(true) {
+                                             var9 = var5[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10 = 71;
+                                                break;
+                                             case 1:
+                                                var10 = 81;
+                                                break;
+                                             case 2:
+                                                var10 = 80;
+                                                break;
+                                             case 3:
+                                                var10 = 68;
+                                                break;
+                                             default:
+                                                var10 = 11;
+                                             }
+
+                                             var5[var6] = (char)(var9 ^ var10);
+                                             ++var1;
+                                             if (var3 == 0) {
+                                                var6 = var3;
+                                                var5 = var10001;
+                                             } else {
+                                                if (var3 <= var1) {
+                                                   g = Pattern.compile((new String(var10001)).intern());
+                                                   return;
+                                                }
+
+                                                var5 = var10001;
+                                                var6 = var1;
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+
+                                    while(true) {
+                                       while(true) {
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                             var10007 = var10004[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             if (var6 <= var1) {
+                                                label1865: {
+                                                   var10000[8] = (new String(var10004)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label1865;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                             var10007 = var10004[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              }
+
+                              while(true) {
+                                 while(true) {
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                       var10007 = var10004[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       if (var6 <= var1) {
+                                          label2000: {
+                                             var10000[6] = (new String(var10004)).intern();
+                                             var10003 = "v~#".toCharArray();
+                                             var10005 = var10003.length;
+                                             var1 = 0;
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= 1) {
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             } else {
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= var1) {
+                                                   break label2000;
+                                                }
+
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             }
+
+                                             while(true) {
+                                                var10007 = var8[var10006];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10008 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10008 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10008 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10008 = 68;
+                                                   break;
+                                                default:
+                                                   var10008 = 11;
+                                                }
+
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          var10000[7] = (new String(var10004)).intern();
+                                          var10003 = "\u0014\b\u0003".toCharArray();
+                                          var10005 = var10003.length;
+                                          var1 = 0;
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= 1) {
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= var1) {
+                                                label2068: {
+                                                   var10000[8] = (new String(var10003)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label2068;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+
+                                          while(true) {
+                                             while(true) {
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                   var10007 = var10004[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      label2176: {
+                                                         var10000[8] = (new String(var10004)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label2176;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                   var10007 = var10004[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                       var10007 = var10004[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+                                 }
+                              }
+                           }
+
+                           var8 = var10003;
+                           var10006 = var1;
+                           var10007 = var10003[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        }
+
+                        while(true) {
+                           while(true) {
+                              var8[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var6 == 0) {
+                                 var10006 = var6;
+                                 var8 = var10004;
+                                 var10007 = var10004[var6];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              } else {
+                                 if (var6 <= var1) {
+                                    label2338: {
+                                       var10000[4] = (new String(var10004)).intern();
+                                       var10003 = "j&\"-\u007f\"\"".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label2338;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 71;
+                                             break;
+                                          case 1:
+                                             var10008 = 81;
+                                             break;
+                                          case 2:
+                                             var10008 = 80;
+                                             break;
+                                          case 3:
+                                             var10008 = 68;
+                                             break;
+                                          default:
+                                             var10008 = 11;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[5] = (new String(var10004)).intern();
+                                    var10003 = "\u0014\b\u0003".toCharArray();
+                                    var10005 = var10003.length;
+                                    var1 = 0;
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= 1) {
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= var1) {
+                                          label2406: {
+                                             var10000[6] = (new String(var10003)).intern();
+                                             var10003 = "v~#".toCharArray();
+                                             var10005 = var10003.length;
+                                             var1 = 0;
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= 1) {
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             } else {
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= var1) {
+                                                   break label2406;
+                                                }
+
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             }
+
+                                             while(true) {
+                                                var10007 = var8[var10006];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10008 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10008 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10008 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10008 = 68;
+                                                   break;
+                                                default:
+                                                   var10008 = 11;
+                                                }
+
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          var10000[7] = (new String(var10004)).intern();
+                                          var10003 = "\u0014\b\u0003".toCharArray();
+                                          var10005 = var10003.length;
+                                          var1 = 0;
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= 1) {
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= var1) {
+                                                label2474: {
+                                                   var10000[8] = (new String(var10003)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label2474;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+
+                                          while(true) {
+                                             while(true) {
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                   var10007 = var10004[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      label2582: {
+                                                         var10000[8] = (new String(var10004)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label2582;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                   var10007 = var10004[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+
+                                    while(true) {
+                                       while(true) {
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                             var10007 = var10004[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             if (var6 <= var1) {
+                                                label2717: {
+                                                   var10000[6] = (new String(var10004)).intern();
+                                                   var10003 = "v~#".toCharArray();
+                                                   var10005 = var10003.length;
+                                                   var1 = 0;
+                                                   var10004 = var10003;
+                                                   var6 = var10005;
+                                                   if (var10005 <= 1) {
+                                                      var8 = var10003;
+                                                      var10006 = var1;
+                                                   } else {
+                                                      var10004 = var10003;
+                                                      var6 = var10005;
+                                                      if (var10005 <= var1) {
+                                                         break label2717;
+                                                      }
+
+                                                      var8 = var10003;
+                                                      var10006 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var10007 = var8[var10006];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10008 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10008 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10008 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10008 = 68;
+                                                         break;
+                                                      default:
+                                                         var10008 = 11;
+                                                      }
+
+                                                      var8[var10006] = (char)(var10007 ^ var10008);
+                                                      ++var1;
+                                                      if (var6 == 0) {
+                                                         var10006 = var6;
+                                                         var8 = var10004;
+                                                      } else {
+                                                         if (var6 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var8 = var10004;
+                                                         var10006 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                var10000[7] = (new String(var10004)).intern();
+                                                var10003 = "\u0014\b\u0003".toCharArray();
+                                                var10005 = var10003.length;
+                                                var1 = 0;
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= 1) {
+                                                   var8 = var10003;
+                                                   var10006 = var1;
+                                                   var10007 = var10003[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   var10004 = var10003;
+                                                   var6 = var10005;
+                                                   if (var10005 <= var1) {
+                                                      label2785: {
+                                                         var10000[8] = (new String(var10003)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label2785;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10003;
+                                                   var10006 = var1;
+                                                   var10007 = var10003[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+
+                                                while(true) {
+                                                   while(true) {
+                                                      var8[var10006] = (char)(var10007 ^ var10008);
+                                                      ++var1;
+                                                      if (var6 == 0) {
+                                                         var10006 = var6;
+                                                         var8 = var10004;
+                                                         var10007 = var10004[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      } else {
+                                                         if (var6 <= var1) {
+                                                            label2893: {
+                                                               var10000[8] = (new String(var10004)).intern();
+                                                               h = var10000;
+                                                               var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                               var10002 = var2.length;
+                                                               var1 = 0;
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= 1) {
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               } else {
+                                                                  var10001 = var2;
+                                                                  var3 = var10002;
+                                                                  if (var10002 <= var1) {
+                                                                     break label2893;
+                                                                  }
+
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               }
+
+                                                               while(true) {
+                                                                  var9 = var5[var6];
+                                                                  switch(var1 % 5) {
+                                                                  case 0:
+                                                                     var10 = 71;
+                                                                     break;
+                                                                  case 1:
+                                                                     var10 = 81;
+                                                                     break;
+                                                                  case 2:
+                                                                     var10 = 80;
+                                                                     break;
+                                                                  case 3:
+                                                                     var10 = 68;
+                                                                     break;
+                                                                  default:
+                                                                     var10 = 11;
+                                                                  }
+
+                                                                  var5[var6] = (char)(var9 ^ var10);
+                                                                  ++var1;
+                                                                  if (var3 == 0) {
+                                                                     var6 = var3;
+                                                                     var5 = var10001;
+                                                                  } else {
+                                                                     if (var3 <= var1) {
+                                                                        break;
+                                                                     }
+
+                                                                     var5 = var10001;
+                                                                     var6 = var1;
+                                                                  }
+                                                               }
+                                                            }
+
+                                                            a = Pattern.compile((new String(var10001)).intern());
+                                                            var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                            var10002 = var2.length;
+                                                            var1 = 0;
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= 1) {
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            } else {
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= var1) {
+                                                                  g = Pattern.compile((new String(var2)).intern());
+                                                                  return;
+                                                               }
+
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            }
+
+                                                            while(true) {
+                                                               var9 = var5[var6];
+                                                               switch(var1 % 5) {
+                                                               case 0:
+                                                                  var10 = 71;
+                                                                  break;
+                                                               case 1:
+                                                                  var10 = 81;
+                                                                  break;
+                                                               case 2:
+                                                                  var10 = 80;
+                                                                  break;
+                                                               case 3:
+                                                                  var10 = 68;
+                                                                  break;
+                                                               default:
+                                                                  var10 = 11;
+                                                               }
+
+                                                               var5[var6] = (char)(var9 ^ var10);
+                                                               ++var1;
+                                                               if (var3 == 0) {
+                                                                  var6 = var3;
+                                                                  var5 = var10001;
+                                                               } else {
+                                                                  if (var3 <= var1) {
+                                                                     g = Pattern.compile((new String(var10001)).intern());
+                                                                     return;
+                                                                  }
+
+                                                                  var5 = var10001;
+                                                                  var6 = var1;
+                                                               }
+                                                            }
+                                                         }
+
+                                                         var8 = var10004;
+                                                         var10006 = var1;
+                                                         var10007 = var10004[var1];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      }
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                             var10007 = var10004[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10004;
+                                 var10006 = var1;
+                                 var10007 = var10004[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              }
+                           }
+                        }
+                     }
+
+                     var8 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 71;
+                        break;
+                     case 1:
+                        var10008 = 81;
+                        break;
+                     case 2:
+                        var10008 = 80;
+                        break;
+                     case 3:
+                        var10008 = 68;
+                        break;
+                     default:
+                        var10008 = 11;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var8[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var6 == 0) {
+                           var10006 = var6;
+                           var8 = var10004;
+                           var10007 = var10004[var6];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        } else {
+                           if (var6 <= var1) {
+                              label739: {
+                                 var10000[2] = (new String(var10004)).intern();
+                                 var10003 = "j#5%o4".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= 1) {
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label739;
+                                    }
+
+                                    var8 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var8[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 71;
+                                       break;
+                                    case 1:
+                                       var10008 = 81;
+                                       break;
+                                    case 2:
+                                       var10008 = 80;
+                                       break;
+                                    case 3:
+                                       var10008 = 68;
+                                       break;
+                                    default:
+                                       var10008 = 11;
+                                    }
+
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                    } else {
+                                       if (var6 <= var1) {
+                                          break;
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[3] = (new String(var10004)).intern();
+                              var10003 = "v~#".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var6 = var10005;
+                              if (var10005 <= 1) {
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              } else {
+                                 var10004 = var10003;
+                                 var6 = var10005;
+                                 if (var10005 <= var1) {
+                                    label783: {
+                                       var10000[4] = (new String(var10003)).intern();
+                                       var10003 = "j&\"-\u007f\"\"".toCharArray();
+                                       var10005 = var10003.length;
+                                       var1 = 0;
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= 1) {
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       } else {
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= var1) {
+                                             break label783;
+                                          }
+
+                                          var8 = var10003;
+                                          var10006 = var1;
+                                       }
+
+                                       while(true) {
+                                          var10007 = var8[var10006];
+                                          switch(var1 % 5) {
+                                          case 0:
+                                             var10008 = 71;
+                                             break;
+                                          case 1:
+                                             var10008 = 81;
+                                             break;
+                                          case 2:
+                                             var10008 = 80;
+                                             break;
+                                          case 3:
+                                             var10008 = 68;
+                                             break;
+                                          default:
+                                             var10008 = 11;
+                                          }
+
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                          } else {
+                                             if (var6 <= var1) {
+                                                break;
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                          }
+                                       }
+                                    }
+
+                                    var10000[5] = (new String(var10004)).intern();
+                                    var10003 = "\u0014\b\u0003".toCharArray();
+                                    var10005 = var10003.length;
+                                    var1 = 0;
+                                    var10004 = var10003;
+                                    var6 = var10005;
+                                    if (var10005 <= 1) {
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       var10004 = var10003;
+                                       var6 = var10005;
+                                       if (var10005 <= var1) {
+                                          label851: {
+                                             var10000[6] = (new String(var10003)).intern();
+                                             var10003 = "v~#".toCharArray();
+                                             var10005 = var10003.length;
+                                             var1 = 0;
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= 1) {
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             } else {
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= var1) {
+                                                   break label851;
+                                                }
+
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             }
+
+                                             while(true) {
+                                                var10007 = var8[var10006];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10008 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10008 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10008 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10008 = 68;
+                                                   break;
+                                                default:
+                                                   var10008 = 11;
+                                                }
+
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          var10000[7] = (new String(var10004)).intern();
+                                          var10003 = "\u0014\b\u0003".toCharArray();
+                                          var10005 = var10003.length;
+                                          var1 = 0;
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= 1) {
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= var1) {
+                                                label919: {
+                                                   var10000[8] = (new String(var10003)).intern();
+                                                   h = var10000;
+                                                   var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                   var10002 = var2.length;
+                                                   var1 = 0;
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= 1) {
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   } else {
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= var1) {
+                                                         break label919;
+                                                      }
+
+                                                      var5 = var2;
+                                                      var6 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var9 = var5[var6];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10 = 68;
+                                                         break;
+                                                      default:
+                                                         var10 = 11;
+                                                      }
+
+                                                      var5[var6] = (char)(var9 ^ var10);
+                                                      ++var1;
+                                                      if (var3 == 0) {
+                                                         var6 = var3;
+                                                         var5 = var10001;
+                                                      } else {
+                                                         if (var3 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var5 = var10001;
+                                                         var6 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                a = Pattern.compile((new String(var10001)).intern());
+                                                var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                var10002 = var2.length;
+                                                var1 = 0;
+                                                var10001 = var2;
+                                                var3 = var10002;
+                                                if (var10002 <= 1) {
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                } else {
+                                                   var10001 = var2;
+                                                   var3 = var10002;
+                                                   if (var10002 <= var1) {
+                                                      g = Pattern.compile((new String(var2)).intern());
+                                                      return;
+                                                   }
+
+                                                   var5 = var2;
+                                                   var6 = var1;
+                                                }
+
+                                                while(true) {
+                                                   var9 = var5[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10 = 68;
+                                                      break;
+                                                   default:
+                                                      var10 = 11;
+                                                   }
+
+                                                   var5[var6] = (char)(var9 ^ var10);
+                                                   ++var1;
+                                                   if (var3 == 0) {
+                                                      var6 = var3;
+                                                      var5 = var10001;
+                                                   } else {
+                                                      if (var3 <= var1) {
+                                                         g = Pattern.compile((new String(var10001)).intern());
+                                                         return;
+                                                      }
+
+                                                      var5 = var10001;
+                                                      var6 = var1;
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+
+                                          while(true) {
+                                             while(true) {
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                   var10007 = var10004[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      label1027: {
+                                                         var10000[8] = (new String(var10004)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label1027;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                   var10007 = var10004[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10003;
+                                       var10006 = var1;
+                                       var10007 = var10003[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+
+                                    while(true) {
+                                       while(true) {
+                                          var8[var10006] = (char)(var10007 ^ var10008);
+                                          ++var1;
+                                          if (var6 == 0) {
+                                             var10006 = var6;
+                                             var8 = var10004;
+                                             var10007 = var10004[var6];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             if (var6 <= var1) {
+                                                label1162: {
+                                                   var10000[6] = (new String(var10004)).intern();
+                                                   var10003 = "v~#".toCharArray();
+                                                   var10005 = var10003.length;
+                                                   var1 = 0;
+                                                   var10004 = var10003;
+                                                   var6 = var10005;
+                                                   if (var10005 <= 1) {
+                                                      var8 = var10003;
+                                                      var10006 = var1;
+                                                   } else {
+                                                      var10004 = var10003;
+                                                      var6 = var10005;
+                                                      if (var10005 <= var1) {
+                                                         break label1162;
+                                                      }
+
+                                                      var8 = var10003;
+                                                      var10006 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var10007 = var8[var10006];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10008 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10008 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10008 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10008 = 68;
+                                                         break;
+                                                      default:
+                                                         var10008 = 11;
+                                                      }
+
+                                                      var8[var10006] = (char)(var10007 ^ var10008);
+                                                      ++var1;
+                                                      if (var6 == 0) {
+                                                         var10006 = var6;
+                                                         var8 = var10004;
+                                                      } else {
+                                                         if (var6 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var8 = var10004;
+                                                         var10006 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                var10000[7] = (new String(var10004)).intern();
+                                                var10003 = "\u0014\b\u0003".toCharArray();
+                                                var10005 = var10003.length;
+                                                var1 = 0;
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= 1) {
+                                                   var8 = var10003;
+                                                   var10006 = var1;
+                                                   var10007 = var10003[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   var10004 = var10003;
+                                                   var6 = var10005;
+                                                   if (var10005 <= var1) {
+                                                      label1230: {
+                                                         var10000[8] = (new String(var10003)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label1230;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10003;
+                                                   var10006 = var1;
+                                                   var10007 = var10003[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+
+                                                while(true) {
+                                                   while(true) {
+                                                      var8[var10006] = (char)(var10007 ^ var10008);
+                                                      ++var1;
+                                                      if (var6 == 0) {
+                                                         var10006 = var6;
+                                                         var8 = var10004;
+                                                         var10007 = var10004[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      } else {
+                                                         if (var6 <= var1) {
+                                                            label1338: {
+                                                               var10000[8] = (new String(var10004)).intern();
+                                                               h = var10000;
+                                                               var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                               var10002 = var2.length;
+                                                               var1 = 0;
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= 1) {
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               } else {
+                                                                  var10001 = var2;
+                                                                  var3 = var10002;
+                                                                  if (var10002 <= var1) {
+                                                                     break label1338;
+                                                                  }
+
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               }
+
+                                                               while(true) {
+                                                                  var9 = var5[var6];
+                                                                  switch(var1 % 5) {
+                                                                  case 0:
+                                                                     var10 = 71;
+                                                                     break;
+                                                                  case 1:
+                                                                     var10 = 81;
+                                                                     break;
+                                                                  case 2:
+                                                                     var10 = 80;
+                                                                     break;
+                                                                  case 3:
+                                                                     var10 = 68;
+                                                                     break;
+                                                                  default:
+                                                                     var10 = 11;
+                                                                  }
+
+                                                                  var5[var6] = (char)(var9 ^ var10);
+                                                                  ++var1;
+                                                                  if (var3 == 0) {
+                                                                     var6 = var3;
+                                                                     var5 = var10001;
+                                                                  } else {
+                                                                     if (var3 <= var1) {
+                                                                        break;
+                                                                     }
+
+                                                                     var5 = var10001;
+                                                                     var6 = var1;
+                                                                  }
+                                                               }
+                                                            }
+
+                                                            a = Pattern.compile((new String(var10001)).intern());
+                                                            var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                            var10002 = var2.length;
+                                                            var1 = 0;
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= 1) {
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            } else {
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= var1) {
+                                                                  g = Pattern.compile((new String(var2)).intern());
+                                                                  return;
+                                                               }
+
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            }
+
+                                                            while(true) {
+                                                               var9 = var5[var6];
+                                                               switch(var1 % 5) {
+                                                               case 0:
+                                                                  var10 = 71;
+                                                                  break;
+                                                               case 1:
+                                                                  var10 = 81;
+                                                                  break;
+                                                               case 2:
+                                                                  var10 = 80;
+                                                                  break;
+                                                               case 3:
+                                                                  var10 = 68;
+                                                                  break;
+                                                               default:
+                                                                  var10 = 11;
+                                                               }
+
+                                                               var5[var6] = (char)(var9 ^ var10);
+                                                               ++var1;
+                                                               if (var3 == 0) {
+                                                                  var6 = var3;
+                                                                  var5 = var10001;
+                                                               } else {
+                                                                  if (var3 <= var1) {
+                                                                     g = Pattern.compile((new String(var10001)).intern());
+                                                                     return;
+                                                                  }
+
+                                                                  var5 = var10001;
+                                                                  var6 = var1;
+                                                               }
+                                                            }
+                                                         }
+
+                                                         var8 = var10004;
+                                                         var10006 = var1;
+                                                         var10007 = var10004[var1];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      }
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10004;
+                                             var10006 = var1;
+                                             var10007 = var10004[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+                                       }
+                                    }
+                                 }
+
+                                 var8 = var10003;
+                                 var10006 = var1;
+                                 var10007 = var10003[var1];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 71;
+                                    break;
+                                 case 1:
+                                    var10008 = 81;
+                                    break;
+                                 case 2:
+                                    var10008 = 80;
+                                    break;
+                                 case 3:
+                                    var10008 = 68;
+                                    break;
+                                 default:
+                                    var10008 = 11;
+                                 }
+                              }
+
+                              while(true) {
+                                 while(true) {
+                                    var8[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var6 == 0) {
+                                       var10006 = var6;
+                                       var8 = var10004;
+                                       var10007 = var10004[var6];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    } else {
+                                       if (var6 <= var1) {
+                                          label375: {
+                                             var10000[4] = (new String(var10004)).intern();
+                                             var10003 = "j&\"-\u007f\"\"".toCharArray();
+                                             var10005 = var10003.length;
+                                             var1 = 0;
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= 1) {
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             } else {
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= var1) {
+                                                   break label375;
+                                                }
+
+                                                var8 = var10003;
+                                                var10006 = var1;
+                                             }
+
+                                             while(true) {
+                                                var10007 = var8[var10006];
+                                                switch(var1 % 5) {
+                                                case 0:
+                                                   var10008 = 71;
+                                                   break;
+                                                case 1:
+                                                   var10008 = 81;
+                                                   break;
+                                                case 2:
+                                                   var10008 = 80;
+                                                   break;
+                                                case 3:
+                                                   var10008 = 68;
+                                                   break;
+                                                default:
+                                                   var10008 = 11;
+                                                }
+
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      break;
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                }
+                                             }
+                                          }
+
+                                          var10000[5] = (new String(var10004)).intern();
+                                          var10003 = "\u0014\b\u0003".toCharArray();
+                                          var10005 = var10003.length;
+                                          var1 = 0;
+                                          var10004 = var10003;
+                                          var6 = var10005;
+                                          if (var10005 <= 1) {
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          } else {
+                                             var10004 = var10003;
+                                             var6 = var10005;
+                                             if (var10005 <= var1) {
+                                                label419: {
+                                                   var10000[6] = (new String(var10003)).intern();
+                                                   var10003 = "v~#".toCharArray();
+                                                   var10005 = var10003.length;
+                                                   var1 = 0;
+                                                   var10004 = var10003;
+                                                   var6 = var10005;
+                                                   if (var10005 <= 1) {
+                                                      var8 = var10003;
+                                                      var10006 = var1;
+                                                   } else {
+                                                      var10004 = var10003;
+                                                      var6 = var10005;
+                                                      if (var10005 <= var1) {
+                                                         break label419;
+                                                      }
+
+                                                      var8 = var10003;
+                                                      var10006 = var1;
+                                                   }
+
+                                                   while(true) {
+                                                      var10007 = var8[var10006];
+                                                      switch(var1 % 5) {
+                                                      case 0:
+                                                         var10008 = 71;
+                                                         break;
+                                                      case 1:
+                                                         var10008 = 81;
+                                                         break;
+                                                      case 2:
+                                                         var10008 = 80;
+                                                         break;
+                                                      case 3:
+                                                         var10008 = 68;
+                                                         break;
+                                                      default:
+                                                         var10008 = 11;
+                                                      }
+
+                                                      var8[var10006] = (char)(var10007 ^ var10008);
+                                                      ++var1;
+                                                      if (var6 == 0) {
+                                                         var10006 = var6;
+                                                         var8 = var10004;
+                                                      } else {
+                                                         if (var6 <= var1) {
+                                                            break;
+                                                         }
+
+                                                         var8 = var10004;
+                                                         var10006 = var1;
+                                                      }
+                                                   }
+                                                }
+
+                                                var10000[7] = (new String(var10004)).intern();
+                                                var10003 = "\u0014\b\u0003".toCharArray();
+                                                var10005 = var10003.length;
+                                                var1 = 0;
+                                                var10004 = var10003;
+                                                var6 = var10005;
+                                                if (var10005 <= 1) {
+                                                   var8 = var10003;
+                                                   var10006 = var1;
+                                                   var10007 = var10003[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   var10004 = var10003;
+                                                   var6 = var10005;
+                                                   if (var10005 <= var1) {
+                                                      label487: {
+                                                         var10000[8] = (new String(var10003)).intern();
+                                                         h = var10000;
+                                                         var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                         var10002 = var2.length;
+                                                         var1 = 0;
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= 1) {
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         } else {
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= var1) {
+                                                               break label487;
+                                                            }
+
+                                                            var5 = var2;
+                                                            var6 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var9 = var5[var6];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10 = 68;
+                                                               break;
+                                                            default:
+                                                               var10 = 11;
+                                                            }
+
+                                                            var5[var6] = (char)(var9 ^ var10);
+                                                            ++var1;
+                                                            if (var3 == 0) {
+                                                               var6 = var3;
+                                                               var5 = var10001;
+                                                            } else {
+                                                               if (var3 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var5 = var10001;
+                                                               var6 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      a = Pattern.compile((new String(var10001)).intern());
+                                                      var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                      var10002 = var2.length;
+                                                      var1 = 0;
+                                                      var10001 = var2;
+                                                      var3 = var10002;
+                                                      if (var10002 <= 1) {
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      } else {
+                                                         var10001 = var2;
+                                                         var3 = var10002;
+                                                         if (var10002 <= var1) {
+                                                            g = Pattern.compile((new String(var2)).intern());
+                                                            return;
+                                                         }
+
+                                                         var5 = var2;
+                                                         var6 = var1;
+                                                      }
+
+                                                      while(true) {
+                                                         var9 = var5[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10 = 68;
+                                                            break;
+                                                         default:
+                                                            var10 = 11;
+                                                         }
+
+                                                         var5[var6] = (char)(var9 ^ var10);
+                                                         ++var1;
+                                                         if (var3 == 0) {
+                                                            var6 = var3;
+                                                            var5 = var10001;
+                                                         } else {
+                                                            if (var3 <= var1) {
+                                                               g = Pattern.compile((new String(var10001)).intern());
+                                                               return;
+                                                            }
+
+                                                            var5 = var10001;
+                                                            var6 = var1;
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10003;
+                                                   var10006 = var1;
+                                                   var10007 = var10003[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+
+                                                while(true) {
+                                                   while(true) {
+                                                      var8[var10006] = (char)(var10007 ^ var10008);
+                                                      ++var1;
+                                                      if (var6 == 0) {
+                                                         var10006 = var6;
+                                                         var8 = var10004;
+                                                         var10007 = var10004[var6];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      } else {
+                                                         if (var6 <= var1) {
+                                                            label595: {
+                                                               var10000[8] = (new String(var10004)).intern();
+                                                               h = var10000;
+                                                               var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                               var10002 = var2.length;
+                                                               var1 = 0;
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= 1) {
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               } else {
+                                                                  var10001 = var2;
+                                                                  var3 = var10002;
+                                                                  if (var10002 <= var1) {
+                                                                     break label595;
+                                                                  }
+
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               }
+
+                                                               while(true) {
+                                                                  var9 = var5[var6];
+                                                                  switch(var1 % 5) {
+                                                                  case 0:
+                                                                     var10 = 71;
+                                                                     break;
+                                                                  case 1:
+                                                                     var10 = 81;
+                                                                     break;
+                                                                  case 2:
+                                                                     var10 = 80;
+                                                                     break;
+                                                                  case 3:
+                                                                     var10 = 68;
+                                                                     break;
+                                                                  default:
+                                                                     var10 = 11;
+                                                                  }
+
+                                                                  var5[var6] = (char)(var9 ^ var10);
+                                                                  ++var1;
+                                                                  if (var3 == 0) {
+                                                                     var6 = var3;
+                                                                     var5 = var10001;
+                                                                  } else {
+                                                                     if (var3 <= var1) {
+                                                                        break;
+                                                                     }
+
+                                                                     var5 = var10001;
+                                                                     var6 = var1;
+                                                                  }
+                                                               }
+                                                            }
+
+                                                            a = Pattern.compile((new String(var10001)).intern());
+                                                            var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                            var10002 = var2.length;
+                                                            var1 = 0;
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= 1) {
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            } else {
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= var1) {
+                                                                  g = Pattern.compile((new String(var2)).intern());
+                                                                  return;
+                                                               }
+
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            }
+
+                                                            while(true) {
+                                                               var9 = var5[var6];
+                                                               switch(var1 % 5) {
+                                                               case 0:
+                                                                  var10 = 71;
+                                                                  break;
+                                                               case 1:
+                                                                  var10 = 81;
+                                                                  break;
+                                                               case 2:
+                                                                  var10 = 80;
+                                                                  break;
+                                                               case 3:
+                                                                  var10 = 68;
+                                                                  break;
+                                                               default:
+                                                                  var10 = 11;
+                                                               }
+
+                                                               var5[var6] = (char)(var9 ^ var10);
+                                                               ++var1;
+                                                               if (var3 == 0) {
+                                                                  var6 = var3;
+                                                                  var5 = var10001;
+                                                               } else {
+                                                                  if (var3 <= var1) {
+                                                                     g = Pattern.compile((new String(var10001)).intern());
+                                                                     return;
+                                                                  }
+
+                                                                  var5 = var10001;
+                                                                  var6 = var1;
+                                                               }
+                                                            }
+                                                         }
+
+                                                         var8 = var10004;
+                                                         var10006 = var1;
+                                                         var10007 = var10004[var1];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      }
+                                                   }
+                                                }
+                                             }
+
+                                             var8 = var10003;
+                                             var10006 = var1;
+                                             var10007 = var10003[var1];
+                                             switch(var1 % 5) {
+                                             case 0:
+                                                var10008 = 71;
+                                                break;
+                                             case 1:
+                                                var10008 = 81;
+                                                break;
+                                             case 2:
+                                                var10008 = 80;
+                                                break;
+                                             case 3:
+                                                var10008 = 68;
+                                                break;
+                                             default:
+                                                var10008 = 11;
+                                             }
+                                          }
+
+                                          while(true) {
+                                             while(true) {
+                                                var8[var10006] = (char)(var10007 ^ var10008);
+                                                ++var1;
+                                                if (var6 == 0) {
+                                                   var10006 = var6;
+                                                   var8 = var10004;
+                                                   var10007 = var10004[var6];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                } else {
+                                                   if (var6 <= var1) {
+                                                      label214: {
+                                                         var10000[6] = (new String(var10004)).intern();
+                                                         var10003 = "v~#".toCharArray();
+                                                         var10005 = var10003.length;
+                                                         var1 = 0;
+                                                         var10004 = var10003;
+                                                         var6 = var10005;
+                                                         if (var10005 <= 1) {
+                                                            var8 = var10003;
+                                                            var10006 = var1;
+                                                         } else {
+                                                            var10004 = var10003;
+                                                            var6 = var10005;
+                                                            if (var10005 <= var1) {
+                                                               break label214;
+                                                            }
+
+                                                            var8 = var10003;
+                                                            var10006 = var1;
+                                                         }
+
+                                                         while(true) {
+                                                            var10007 = var8[var10006];
+                                                            switch(var1 % 5) {
+                                                            case 0:
+                                                               var10008 = 71;
+                                                               break;
+                                                            case 1:
+                                                               var10008 = 81;
+                                                               break;
+                                                            case 2:
+                                                               var10008 = 80;
+                                                               break;
+                                                            case 3:
+                                                               var10008 = 68;
+                                                               break;
+                                                            default:
+                                                               var10008 = 11;
+                                                            }
+
+                                                            var8[var10006] = (char)(var10007 ^ var10008);
+                                                            ++var1;
+                                                            if (var6 == 0) {
+                                                               var10006 = var6;
+                                                               var8 = var10004;
+                                                            } else {
+                                                               if (var6 <= var1) {
+                                                                  break;
+                                                               }
+
+                                                               var8 = var10004;
+                                                               var10006 = var1;
+                                                            }
+                                                         }
+                                                      }
+
+                                                      var10000[7] = (new String(var10004)).intern();
+                                                      var10003 = "\u0014\b\u0003".toCharArray();
+                                                      var10005 = var10003.length;
+                                                      var1 = 0;
+                                                      var10004 = var10003;
+                                                      var6 = var10005;
+                                                      if (var10005 <= 1) {
+                                                         var8 = var10003;
+                                                         var10006 = var1;
+                                                         var10007 = var10003[var1];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      } else {
+                                                         var10004 = var10003;
+                                                         var6 = var10005;
+                                                         if (var10005 <= var1) {
+                                                            label178: {
+                                                               var10000[8] = (new String(var10003)).intern();
+                                                               h = var10000;
+                                                               var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                               var10002 = var2.length;
+                                                               var1 = 0;
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= 1) {
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               } else {
+                                                                  var10001 = var2;
+                                                                  var3 = var10002;
+                                                                  if (var10002 <= var1) {
+                                                                     break label178;
+                                                                  }
+
+                                                                  var5 = var2;
+                                                                  var6 = var1;
+                                                               }
+
+                                                               while(true) {
+                                                                  var9 = var5[var6];
+                                                                  switch(var1 % 5) {
+                                                                  case 0:
+                                                                     var10 = 71;
+                                                                     break;
+                                                                  case 1:
+                                                                     var10 = 81;
+                                                                     break;
+                                                                  case 2:
+                                                                     var10 = 80;
+                                                                     break;
+                                                                  case 3:
+                                                                     var10 = 68;
+                                                                     break;
+                                                                  default:
+                                                                     var10 = 11;
+                                                                  }
+
+                                                                  var5[var6] = (char)(var9 ^ var10);
+                                                                  ++var1;
+                                                                  if (var3 == 0) {
+                                                                     var6 = var3;
+                                                                     var5 = var10001;
+                                                                  } else {
+                                                                     if (var3 <= var1) {
+                                                                        break;
+                                                                     }
+
+                                                                     var5 = var10001;
+                                                                     var6 = var1;
+                                                                  }
+                                                               }
+                                                            }
+
+                                                            a = Pattern.compile((new String(var10001)).intern());
+                                                            var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                            var10002 = var2.length;
+                                                            var1 = 0;
+                                                            var10001 = var2;
+                                                            var3 = var10002;
+                                                            if (var10002 <= 1) {
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            } else {
+                                                               var10001 = var2;
+                                                               var3 = var10002;
+                                                               if (var10002 <= var1) {
+                                                                  g = Pattern.compile((new String(var2)).intern());
+                                                                  return;
+                                                               }
+
+                                                               var5 = var2;
+                                                               var6 = var1;
+                                                            }
+
+                                                            while(true) {
+                                                               var9 = var5[var6];
+                                                               switch(var1 % 5) {
+                                                               case 0:
+                                                                  var10 = 71;
+                                                                  break;
+                                                               case 1:
+                                                                  var10 = 81;
+                                                                  break;
+                                                               case 2:
+                                                                  var10 = 80;
+                                                                  break;
+                                                               case 3:
+                                                                  var10 = 68;
+                                                                  break;
+                                                               default:
+                                                                  var10 = 11;
+                                                               }
+
+                                                               var5[var6] = (char)(var9 ^ var10);
+                                                               ++var1;
+                                                               if (var3 == 0) {
+                                                                  var6 = var3;
+                                                                  var5 = var10001;
+                                                               } else {
+                                                                  if (var3 <= var1) {
+                                                                     g = Pattern.compile((new String(var10001)).intern());
+                                                                     return;
+                                                                  }
+
+                                                                  var5 = var10001;
+                                                                  var6 = var1;
+                                                               }
+                                                            }
+                                                         }
+
+                                                         var8 = var10003;
+                                                         var10006 = var1;
+                                                         var10007 = var10003[var1];
+                                                         switch(var1 % 5) {
+                                                         case 0:
+                                                            var10008 = 71;
+                                                            break;
+                                                         case 1:
+                                                            var10008 = 81;
+                                                            break;
+                                                         case 2:
+                                                            var10008 = 80;
+                                                            break;
+                                                         case 3:
+                                                            var10008 = 68;
+                                                            break;
+                                                         default:
+                                                            var10008 = 11;
+                                                         }
+                                                      }
+
+                                                      while(true) {
+                                                         while(true) {
+                                                            var8[var10006] = (char)(var10007 ^ var10008);
+                                                            ++var1;
+                                                            if (var6 == 0) {
+                                                               var10006 = var6;
+                                                               var8 = var10004;
+                                                               var10007 = var10004[var6];
+                                                               switch(var1 % 5) {
+                                                               case 0:
+                                                                  var10008 = 71;
+                                                                  break;
+                                                               case 1:
+                                                                  var10008 = 81;
+                                                                  break;
+                                                               case 2:
+                                                                  var10008 = 80;
+                                                                  break;
+                                                               case 3:
+                                                                  var10008 = 68;
+                                                                  break;
+                                                               default:
+                                                                  var10008 = 11;
+                                                               }
+                                                            } else {
+                                                               if (var6 <= var1) {
+                                                                  label258: {
+                                                                     var10000[8] = (new String(var10004)).intern();
+                                                                     h = var10000;
+                                                                     var2 = "o2 1W#zyd o\r4o\"iz".toCharArray();
+                                                                     var10002 = var2.length;
+                                                                     var1 = 0;
+                                                                     var10001 = var2;
+                                                                     var3 = var10002;
+                                                                     if (var10002 <= 1) {
+                                                                        var5 = var2;
+                                                                        var6 = var1;
+                                                                     } else {
+                                                                        var10001 = var2;
+                                                                        var3 = var10002;
+                                                                        if (var10002 <= var1) {
+                                                                           break label258;
+                                                                        }
+
+                                                                        var5 = var2;
+                                                                        var6 = var1;
+                                                                     }
+
+                                                                     while(true) {
+                                                                        var9 = var5[var6];
+                                                                        switch(var1 % 5) {
+                                                                        case 0:
+                                                                           var10 = 71;
+                                                                           break;
+                                                                        case 1:
+                                                                           var10 = 81;
+                                                                           break;
+                                                                        case 2:
+                                                                           var10 = 80;
+                                                                           break;
+                                                                        case 3:
+                                                                           var10 = 68;
+                                                                           break;
+                                                                        default:
+                                                                           var10 = 11;
+                                                                        }
+
+                                                                        var5[var6] = (char)(var9 ^ var10);
+                                                                        ++var1;
+                                                                        if (var3 == 0) {
+                                                                           var6 = var3;
+                                                                           var5 = var10001;
+                                                                        } else {
+                                                                           if (var3 <= var1) {
+                                                                              break;
+                                                                           }
+
+                                                                           var5 = var10001;
+                                                                           var6 = var1;
+                                                                        }
+                                                                     }
+                                                                  }
+
+                                                                  a = Pattern.compile((new String(var10001)).intern());
+                                                                  var2 = "gz\f  gz\f  gzx\u001fjj+\ro\"gzx\u0018olxpoW#zpo#\u001b5{m%m".toCharArray();
+                                                                  var10002 = var2.length;
+                                                                  var1 = 0;
+                                                                  var10001 = var2;
+                                                                  var3 = var10002;
+                                                                  if (var10002 <= 1) {
+                                                                     var5 = var2;
+                                                                     var6 = var1;
+                                                                  } else {
+                                                                     var10001 = var2;
+                                                                     var3 = var10002;
+                                                                     if (var10002 <= var1) {
+                                                                        g = Pattern.compile((new String(var2)).intern());
+                                                                        return;
+                                                                     }
+
+                                                                     var5 = var2;
+                                                                     var6 = var1;
+                                                                  }
+
+                                                                  while(true) {
+                                                                     var9 = var5[var6];
+                                                                     switch(var1 % 5) {
+                                                                     case 0:
+                                                                        var10 = 71;
+                                                                        break;
+                                                                     case 1:
+                                                                        var10 = 81;
+                                                                        break;
+                                                                     case 2:
+                                                                        var10 = 80;
+                                                                        break;
+                                                                     case 3:
+                                                                        var10 = 68;
+                                                                        break;
+                                                                     default:
+                                                                        var10 = 11;
+                                                                     }
+
+                                                                     var5[var6] = (char)(var9 ^ var10);
+                                                                     ++var1;
+                                                                     if (var3 == 0) {
+                                                                        var6 = var3;
+                                                                        var5 = var10001;
+                                                                     } else {
+                                                                        if (var3 <= var1) {
+                                                                           g = Pattern.compile((new String(var10001)).intern());
+                                                                           return;
+                                                                        }
+
+                                                                        var5 = var10001;
+                                                                        var6 = var1;
+                                                                     }
+                                                                  }
+                                                               }
+
+                                                               var8 = var10004;
+                                                               var10006 = var1;
+                                                               var10007 = var10004[var1];
+                                                               switch(var1 % 5) {
+                                                               case 0:
+                                                                  var10008 = 71;
+                                                                  break;
+                                                               case 1:
+                                                                  var10008 = 81;
+                                                                  break;
+                                                               case 2:
+                                                                  var10008 = 80;
+                                                                  break;
+                                                               case 3:
+                                                                  var10008 = 68;
+                                                                  break;
+                                                               default:
+                                                                  var10008 = 11;
+                                                               }
+                                                            }
+                                                         }
+                                                      }
+                                                   }
+
+                                                   var8 = var10004;
+                                                   var10006 = var1;
+                                                   var10007 = var10004[var1];
+                                                   switch(var1 % 5) {
+                                                   case 0:
+                                                      var10008 = 71;
+                                                      break;
+                                                   case 1:
+                                                      var10008 = 81;
+                                                      break;
+                                                   case 2:
+                                                      var10008 = 80;
+                                                      break;
+                                                   case 3:
+                                                      var10008 = 68;
+                                                      break;
+                                                   default:
+                                                      var10008 = 11;
+                                                   }
+                                                }
+                                             }
+                                          }
+                                       }
+
+                                       var8 = var10004;
+                                       var10006 = var1;
+                                       var10007 = var10004[var1];
+                                       switch(var1 % 5) {
+                                       case 0:
+                                          var10008 = 71;
+                                          break;
+                                       case 1:
+                                          var10008 = 81;
+                                          break;
+                                       case 2:
+                                          var10008 = 80;
+                                          break;
+                                       case 3:
+                                          var10008 = 68;
+                                          break;
+                                       default:
+                                          var10008 = 11;
+                                       }
+                                    }
+                                 }
+                              }
+                           }
+
+                           var8 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 71;
+                              break;
+                           case 1:
+                              var10008 = 81;
+                              break;
+                           case 2:
+                              var10008 = 80;
+                              break;
+                           case 3:
+                              var10008 = 68;
+                              break;
+                           default:
+                              var10008 = 11;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var8 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 71;
+                  break;
+               case 1:
+                  var10008 = 81;
+                  break;
+               case 2:
+                  var10008 = 80;
+                  break;
+               case 3:
+                  var10008 = 68;
+                  break;
+               default:
+                  var10008 = 11;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/ak.java b/testData/obfuscated/ak.java
new file mode 100644
index 0000000..f463318
--- /dev/null
+++ b/testData/obfuscated/ak.java
@@ -0,0 +1,11 @@
+public interface ak {
+   String a();
+
+   String b();
+
+   String c();
+
+   double d();
+
+   Double e();
+}
diff --git a/testData/obfuscated/al.java b/testData/obfuscated/al.java
new file mode 100644
index 0000000..2ca4151
--- /dev/null
+++ b/testData/obfuscated/al.java
@@ -0,0 +1,459 @@
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+public class al implements Comparable<al> {
+   private final ak a;
+   private final List<n<Date, Double>> b = new ArrayList();
+   private final List<n<Date, Double>> c = new ArrayList();
+   private double d = 0.0D;
+   private double e = 0.0D;
+   private double f = 0.0D;
+   private static final String[] g;
+
+   public al(ak var1) {
+      this.a = var1;
+   }
+
+   protected static long a(Date param0, Date param1, TimeUnit param2) {
+      // $FF: Couldn't be decompiled
+   }
+
+   protected static <T> T a(List<T> param0) {
+      // $FF: Couldn't be decompiled
+   }
+
+   protected static <T> T b(List<T> param0) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public void a(double param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public ak a() {
+      return this.a;
+   }
+
+   public List<n<Date, Double>> b() {
+      return this.b;
+   }
+
+   public List<n<Date, Double>> c() {
+      return this.c;
+   }
+
+   public double d() {
+      return this.d;
+   }
+
+   public double e() {
+      try {
+         if (this.b.isEmpty()) {
+            return 0.0D;
+         }
+      } catch (a_ var1) {
+         throw var1;
+      }
+
+      return this.e / (double)this.b.size();
+   }
+
+   public double f() {
+      try {
+         if (this.c.isEmpty()) {
+            return 0.0D;
+         }
+      } catch (a_ var1) {
+         throw var1;
+      }
+
+      return this.f / (double)this.c.size();
+   }
+
+   public String toString() {
+      StringBuilder var1 = new StringBuilder(this.a.a());
+
+      try {
+         var1.append(g[2]);
+         var1.append(this.a.b());
+         if (this.a.c() != null) {
+            var1.append(g[1]);
+            var1.append(this.a.c());
+            var1.append("]");
+         }
+      } catch (a_ var2) {
+         throw var2;
+      }
+
+      var1.append(g[0]);
+      var1.append(DecimalFormat.getNumberInstance().format(this.d()));
+      var1.append(" ");
+      var1.append(DecimalFormat.getNumberInstance().format(this.e()));
+      var1.append(" ");
+      var1.append(DecimalFormat.getNumberInstance().format(this.f()));
+      return var1.toString();
+   }
+
+   protected static boolean a(Object param0, Object param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public int a(al var1) {
+      try {
+         if (var1 == null) {
+            return 1;
+         }
+      } catch (a_ var2) {
+         throw var2;
+      }
+
+      try {
+         if (a(this.a().a(), var1.a().a())) {
+            return this.a().b().compareTo(var1.a().b());
+         }
+      } catch (a_ var3) {
+         throw var3;
+      }
+
+      return this.a().a().compareTo(var1.a().a());
+   }
+
+   static {
+      String[] var10000 = new String[3];
+      char[] var10003 = "\u0007Y".toCharArray();
+      int var10005 = var10003.length;
+      int var1 = 0;
+      char[] var10004 = var10003;
+      int var2 = var10005;
+      char[] var4;
+      int var10006;
+      char var10007;
+      byte var10008;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 61;
+            break;
+         case 1:
+            var10008 = 121;
+            break;
+         case 2:
+            var10008 = 103;
+            break;
+         case 3:
+            var10008 = 113;
+            break;
+         default:
+            var10008 = 123;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label127: {
+               var10000[0] = (new String(var10003)).intern();
+               var10003 = "\u001d\"".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label127;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 61;
+                     break;
+                  case 1:
+                     var10008 = 121;
+                     break;
+                  case 2:
+                     var10008 = 103;
+                     break;
+                  case 3:
+                     var10008 = 113;
+                     break;
+                  default:
+                     var10008 = 123;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[1] = (new String(var10004)).intern();
+            var10003 = "\u001dTG".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  var10000[2] = (new String(var10003)).intern();
+                  g = var10000;
+                  return;
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+            }
+
+            while(true) {
+               var10007 = var4[var10006];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 61;
+                  break;
+               case 1:
+                  var10008 = 121;
+                  break;
+               case 2:
+                  var10008 = 103;
+                  break;
+               case 3:
+                  var10008 = 113;
+                  break;
+               default:
+                  var10008 = 123;
+               }
+
+               var4[var10006] = (char)(var10007 ^ var10008);
+               ++var1;
+               if (var2 == 0) {
+                  var10006 = var2;
+                  var4 = var10004;
+               } else {
+                  if (var2 <= var1) {
+                     var10000[2] = (new String(var10004)).intern();
+                     g = var10000;
+                     return;
+                  }
+
+                  var4 = var10004;
+                  var10006 = var1;
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 61;
+            break;
+         case 1:
+            var10008 = 121;
+            break;
+         case 2:
+            var10008 = 103;
+            break;
+         case 3:
+            var10008 = 113;
+            break;
+         default:
+            var10008 = 123;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 61;
+                  break;
+               case 1:
+                  var10008 = 121;
+                  break;
+               case 2:
+                  var10008 = 103;
+                  break;
+               case 3:
+                  var10008 = 113;
+                  break;
+               default:
+                  var10008 = 123;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label65: {
+                     var10000[0] = (new String(var10004)).intern();
+                     var10003 = "\u001d\"".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label65;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 61;
+                           break;
+                        case 1:
+                           var10008 = 121;
+                           break;
+                        case 2:
+                           var10008 = 103;
+                           break;
+                        case 3:
+                           var10008 = 113;
+                           break;
+                        default:
+                           var10008 = 123;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[1] = (new String(var10004)).intern();
+                  var10003 = "\u001dTG".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[2] = (new String(var10003)).intern();
+                        g = var10000;
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 61;
+                        break;
+                     case 1:
+                        var10008 = 121;
+                        break;
+                     case 2:
+                        var10008 = 103;
+                        break;
+                     case 3:
+                        var10008 = 113;
+                        break;
+                     default:
+                        var10008 = 123;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[2] = (new String(var10004)).intern();
+                           g = var10000;
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 61;
+                  break;
+               case 1:
+                  var10008 = 121;
+                  break;
+               case 2:
+                  var10008 = 103;
+                  break;
+               case 3:
+                  var10008 = 113;
+                  break;
+               default:
+                  var10008 = 123;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/am.java b/testData/obfuscated/am.java
new file mode 100644
index 0000000..7353ace
--- /dev/null
+++ b/testData/obfuscated/am.java
@@ -0,0 +1,3 @@
+public interface am {
+   void a(k<ak> var1);
+}
diff --git a/testData/obfuscated/an.java b/testData/obfuscated/an.java
new file mode 100644
index 0000000..59d7f06
--- /dev/null
+++ b/testData/obfuscated/an.java
@@ -0,0 +1,1057 @@
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.MemoryPoolMXBean;
+import java.lang.management.OperatingSystemMXBean;
+import java.lang.management.ThreadMXBean;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+@aa(
+   a = {am.class}
+)
+public class an implements am {
+   private OperatingSystemMXBean a = ManagementFactory.getOperatingSystemMXBean();
+   private MemoryMXBean b = ManagementFactory.getMemoryMXBean();
+   private List<MemoryPoolMXBean> c = ManagementFactory.getMemoryPoolMXBeans();
+   private ThreadMXBean d = ManagementFactory.getThreadMXBean();
+   private List<GarbageCollectorMXBean> e = ManagementFactory.getGarbageCollectorMXBeans();
+   private Map<Long, ao> f = Collections.synchronizedMap(new TreeMap());
+   private ak g;
+   private List<aw> h;
+   private ak i;
+   private ak j;
+   public static boolean k;
+   private static final String[] l;
+
+   public an() {
+      this.g = new at(this, l[2], l[1]);
+      this.i = new au(this, l[0], l[5]);
+      this.j = new av(this, l[4], l[3]);
+   }
+
+   private List<aw> a() {
+      boolean var4 = k;
+
+      List var10000;
+      label45: {
+         try {
+            var10000 = this.h;
+            if (var4) {
+               return var10000;
+            }
+
+            if (var10000 != null) {
+               break label45;
+            }
+         } catch (a_ var6) {
+            throw var6;
+         }
+
+         ArrayList var1 = new ArrayList();
+         Iterator var2 = this.c.iterator();
+
+         while(var2.hasNext()) {
+            MemoryPoolMXBean var3 = (MemoryPoolMXBean)var2.next();
+
+            try {
+               var1.add(new aw(this, var3));
+               if (var4) {
+                  break label45;
+               }
+
+               if (var4) {
+                  break;
+               }
+            } catch (a_ var5) {
+               throw var5;
+            }
+         }
+
+         this.h = var1;
+      }
+
+      var10000 = this.h;
+      return var10000;
+   }
+
+   public void a(k<ak> var1) {
+      var1.a((Object)this.g);
+      var1.a((Collection)this.a());
+      var1.a((Object)this.i);
+      var1.a((Object)this.j);
+   }
+
+   public List<ao> b() {
+      ArrayList var1 = new ArrayList(this.f.values());
+      Collections.sort(var1);
+      return var1;
+   }
+
+   static MemoryMXBean a(an var0) {
+      return var0.b;
+   }
+
+   static Map b(an var0) {
+      return var0.f;
+   }
+
+   static ThreadMXBean c(an var0) {
+      return var0.d;
+   }
+
+   static OperatingSystemMXBean d(an var0) {
+      return var0.a;
+   }
+
+   static List e(an var0) {
+      return var0.e;
+   }
+
+   static {
+      String[] var10000;
+      int var1;
+      int var2;
+      char[] var10003;
+      char[] var10004;
+      char[] var4;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label304: {
+         var10000 = new String[6];
+         var10003 = "\u0006\b\u000e".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= 1) {
+            var4 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= var1) {
+               break label304;
+            }
+
+            var4 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var4[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 76;
+               break;
+            case 1:
+               var10008 = 94;
+               break;
+            case 2:
+               var10008 = 67;
+               break;
+            case 3:
+               var10008 = 50;
+               break;
+            default:
+               var10008 = 117;
+            }
+
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "\u0004;\"B".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var2 = var10005;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 76;
+            break;
+         case 1:
+            var10008 = 94;
+            break;
+         case 2:
+            var10008 = 67;
+            break;
+         case 3:
+            var10008 = 50;
+            break;
+         default:
+            var10008 = 117;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label347: {
+               var10000[1] = (new String(var10003)).intern();
+               var10003 = "\u0006\b\u000e".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label347;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 76;
+                     break;
+                  case 1:
+                     var10008 = 94;
+                     break;
+                  case 2:
+                     var10008 = 67;
+                     break;
+                  case 3:
+                     var10008 = 50;
+                     break;
+                  default:
+                     var10008 = 117;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[2] = (new String(var10004)).intern();
+            var10003 = "\u000b\u001d".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 76;
+                  break;
+               case 1:
+                  var10008 = 94;
+                  break;
+               case 2:
+                  var10008 = 67;
+                  break;
+               case 3:
+                  var10008 = 50;
+                  break;
+               default:
+                  var10008 = 117;
+               }
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  label415: {
+                     var10000[3] = (new String(var10003)).intern();
+                     var10003 = "\u0006\b\u000e".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label415;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 76;
+                           break;
+                        case 1:
+                           var10008 = 94;
+                           break;
+                        case 2:
+                           var10008 = 67;
+                           break;
+                        case 3:
+                           var10008 = 50;
+                           break;
+                        default:
+                           var10008 = 117;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[4] = (new String(var10004)).intern();
+                  var10003 = "\u000f\u000e\u0016".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[5] = (new String(var10003)).intern();
+                        l = var10000;
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 76;
+                        break;
+                     case 1:
+                        var10008 = 94;
+                        break;
+                     case 2:
+                        var10008 = 67;
+                        break;
+                     case 3:
+                        var10008 = 50;
+                        break;
+                     default:
+                        var10008 = 117;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[5] = (new String(var10004)).intern();
+                           l = var10000;
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 76;
+                  break;
+               case 1:
+                  var10008 = 94;
+                  break;
+               case 2:
+                  var10008 = 67;
+                  break;
+               case 3:
+                  var10008 = 50;
+                  break;
+               default:
+                  var10008 = 117;
+               }
+            }
+
+            while(true) {
+               while(true) {
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                     var10007 = var10004[var2];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 76;
+                        break;
+                     case 1:
+                        var10008 = 94;
+                        break;
+                     case 2:
+                        var10008 = 67;
+                        break;
+                     case 3:
+                        var10008 = 50;
+                        break;
+                     default:
+                        var10008 = 117;
+                     }
+                  } else {
+                     if (var2 <= var1) {
+                        label523: {
+                           var10000[3] = (new String(var10004)).intern();
+                           var10003 = "\u0006\b\u000e".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label523;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 76;
+                                 break;
+                              case 1:
+                                 var10008 = 94;
+                                 break;
+                              case 2:
+                                 var10008 = 67;
+                                 break;
+                              case 3:
+                                 var10008 = 50;
+                                 break;
+                              default:
+                                 var10008 = 117;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[4] = (new String(var10004)).intern();
+                        var10003 = "\u000f\u000e\u0016".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[5] = (new String(var10003)).intern();
+                              l = var10000;
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 76;
+                              break;
+                           case 1:
+                              var10008 = 94;
+                              break;
+                           case 2:
+                              var10008 = 67;
+                              break;
+                           case 3:
+                              var10008 = 50;
+                              break;
+                           default:
+                              var10008 = 117;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[5] = (new String(var10004)).intern();
+                                 l = var10000;
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                     var10007 = var10004[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 76;
+                        break;
+                     case 1:
+                        var10008 = 94;
+                        break;
+                     case 2:
+                        var10008 = 67;
+                        break;
+                     case 3:
+                        var10008 = 50;
+                        break;
+                     default:
+                        var10008 = 117;
+                     }
+                  }
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 76;
+            break;
+         case 1:
+            var10008 = 94;
+            break;
+         case 2:
+            var10008 = 67;
+            break;
+         case 3:
+            var10008 = 50;
+            break;
+         default:
+            var10008 = 117;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 76;
+                  break;
+               case 1:
+                  var10008 = 94;
+                  break;
+               case 2:
+                  var10008 = 67;
+                  break;
+               case 3:
+                  var10008 = 50;
+                  break;
+               default:
+                  var10008 = 117;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label143: {
+                     var10000[1] = (new String(var10004)).intern();
+                     var10003 = "\u0006\b\u000e".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label143;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 76;
+                           break;
+                        case 1:
+                           var10008 = 94;
+                           break;
+                        case 2:
+                           var10008 = 67;
+                           break;
+                        case 3:
+                           var10008 = 50;
+                           break;
+                        default:
+                           var10008 = 117;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[2] = (new String(var10004)).intern();
+                  var10003 = "\u000b\u001d".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 76;
+                        break;
+                     case 1:
+                        var10008 = 94;
+                        break;
+                     case 2:
+                        var10008 = 67;
+                        break;
+                     case 3:
+                        var10008 = 50;
+                        break;
+                     default:
+                        var10008 = 117;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        label187: {
+                           var10000[3] = (new String(var10003)).intern();
+                           var10003 = "\u0006\b\u000e".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label187;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 76;
+                                 break;
+                              case 1:
+                                 var10008 = 94;
+                                 break;
+                              case 2:
+                                 var10008 = 67;
+                                 break;
+                              case 3:
+                                 var10008 = 50;
+                                 break;
+                              default:
+                                 var10008 = 117;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[4] = (new String(var10004)).intern();
+                        var10003 = "\u000f\u000e\u0016".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[5] = (new String(var10003)).intern();
+                              l = var10000;
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 76;
+                              break;
+                           case 1:
+                              var10008 = 94;
+                              break;
+                           case 2:
+                              var10008 = 67;
+                              break;
+                           case 3:
+                              var10008 = 50;
+                              break;
+                           default:
+                              var10008 = 117;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[5] = (new String(var10004)).intern();
+                                 l = var10000;
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 76;
+                        break;
+                     case 1:
+                        var10008 = 94;
+                        break;
+                     case 2:
+                        var10008 = 67;
+                        break;
+                     case 3:
+                        var10008 = 50;
+                        break;
+                     default:
+                        var10008 = 117;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                           var10007 = var10004[var2];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 76;
+                              break;
+                           case 1:
+                              var10008 = 94;
+                              break;
+                           case 2:
+                              var10008 = 67;
+                              break;
+                           case 3:
+                              var10008 = 50;
+                              break;
+                           default:
+                              var10008 = 117;
+                           }
+                        } else {
+                           if (var2 <= var1) {
+                              label107: {
+                                 var10000[3] = (new String(var10004)).intern();
+                                 var10003 = "\u0006\b\u000e".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= 1) {
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var2 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label107;
+                                    }
+
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var4[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 76;
+                                       break;
+                                    case 1:
+                                       var10008 = 94;
+                                       break;
+                                    case 2:
+                                       var10008 = 67;
+                                       break;
+                                    case 3:
+                                       var10008 = 50;
+                                       break;
+                                    default:
+                                       var10008 = 117;
+                                    }
+
+                                    var4[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var2 == 0) {
+                                       var10006 = var2;
+                                       var4 = var10004;
+                                    } else {
+                                       if (var2 <= var1) {
+                                          break;
+                                       }
+
+                                       var4 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[4] = (new String(var10004)).intern();
+                              var10003 = "\u000f\u000e\u0016".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= 1) {
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              } else {
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= var1) {
+                                    var10000[5] = (new String(var10003)).intern();
+                                    l = var10000;
+                                    return;
+                                 }
+
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              }
+
+                              while(true) {
+                                 var10007 = var4[var10006];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 76;
+                                    break;
+                                 case 1:
+                                    var10008 = 94;
+                                    break;
+                                 case 2:
+                                    var10008 = 67;
+                                    break;
+                                 case 3:
+                                    var10008 = 50;
+                                    break;
+                                 default:
+                                    var10008 = 117;
+                                 }
+
+                                 var4[var10006] = (char)(var10007 ^ var10008);
+                                 ++var1;
+                                 if (var2 == 0) {
+                                    var10006 = var2;
+                                    var4 = var10004;
+                                 } else {
+                                    if (var2 <= var1) {
+                                       var10000[5] = (new String(var10004)).intern();
+                                       l = var10000;
+                                       return;
+                                    }
+
+                                    var4 = var10004;
+                                    var10006 = var1;
+                                 }
+                              }
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 76;
+                              break;
+                           case 1:
+                              var10008 = 94;
+                              break;
+                           case 2:
+                              var10008 = 67;
+                              break;
+                           case 3:
+                              var10008 = 50;
+                              break;
+                           default:
+                              var10008 = 117;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 76;
+                  break;
+               case 1:
+                  var10008 = 94;
+                  break;
+               case 2:
+                  var10008 = 67;
+                  break;
+               case 3:
+                  var10008 = 50;
+                  break;
+               default:
+                  var10008 = 117;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/ao.java b/testData/obfuscated/ao.java
new file mode 100644
index 0000000..745e043
--- /dev/null
+++ b/testData/obfuscated/ao.java
@@ -0,0 +1,25 @@
+import java.lang.Thread.State;
+
+public class ao implements Comparable<ao> {
+   protected String a;
+   protected State b;
+   protected double c;
+   protected long d;
+   protected long e;
+
+   public String a() {
+      return this.a;
+   }
+
+   public State b() {
+      return this.b;
+   }
+
+   public double c() {
+      return this.c;
+   }
+
+   public int a(ao param1) {
+      // $FF: Couldn't be decompiled
+   }
+}
diff --git a/testData/obfuscated/ap.java b/testData/obfuscated/ap.java
new file mode 100644
index 0000000..8f14fd7
--- /dev/null
+++ b/testData/obfuscated/ap.java
@@ -0,0 +1,91 @@
+public abstract class ap implements ak {
+   private final String a;
+   private final String b;
+   public static int c;
+   private static final String d;
+
+   public ap(String var1, String var2) {
+      this.b = var1;
+      this.a = var2;
+   }
+
+   public String b() {
+      return this.a;
+   }
+
+   public String a() {
+      return this.b;
+   }
+
+   public int hashCode() {
+      return (this.b + this.a).hashCode();
+   }
+
+   public boolean equals(Object param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public String toString() {
+      return this.b + d + this.a;
+   }
+
+   static {
+      char[] var10000 = "K\u000eX".toCharArray();
+      int var10002 = var10000.length;
+      int var1 = 0;
+      char[] var10001 = var10000;
+      int var2 = var10002;
+      int var10003;
+      char[] var4;
+      if (var10002 <= 1) {
+         var4 = var10000;
+         var10003 = var1;
+      } else {
+         var10001 = var10000;
+         var2 = var10002;
+         if (var10002 <= var1) {
+            d = (new String(var10000)).intern();
+            return;
+         }
+
+         var4 = var10000;
+         var10003 = var1;
+      }
+
+      while(true) {
+         char var10004 = var4[var10003];
+         byte var10005;
+         switch(var1 % 5) {
+         case 0:
+            var10005 = 107;
+            break;
+         case 1:
+            var10005 = 35;
+            break;
+         case 2:
+            var10005 = 120;
+            break;
+         case 3:
+            var10005 = 65;
+            break;
+         default:
+            var10005 = 23;
+         }
+
+         var4[var10003] = (char)(var10004 ^ var10005);
+         ++var1;
+         if (var2 == 0) {
+            var10003 = var2;
+            var4 = var10001;
+         } else {
+            if (var2 <= var1) {
+               d = (new String(var10001)).intern();
+               return;
+            }
+
+            var4 = var10001;
+            var10003 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/aq.java b/testData/obfuscated/aq.java
new file mode 100644
index 0000000..784fb30
--- /dev/null
+++ b/testData/obfuscated/aq.java
@@ -0,0 +1,29 @@
+public class aq extends ap {
+   private volatile long d;
+   private volatile long e;
+   private final String f;
+   private static final long g = 4611686018427387903L;
+   private final Double h;
+
+   public aq(String var1, String var2, String var3, Double var4) {
+      super(var1, var2);
+      this.f = var3;
+      this.h = var4;
+   }
+
+   public String c() {
+      return this.f;
+   }
+
+   public void a(long param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public double d() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public Double e() {
+      return this.h;
+   }
+}
diff --git a/testData/obfuscated/ar.java b/testData/obfuscated/ar.java
new file mode 100644
index 0000000..bf70813
--- /dev/null
+++ b/testData/obfuscated/ar.java
@@ -0,0 +1,22 @@
+public class ar extends ap {
+   private final String d;
+   private final double e;
+
+   public ar(String var1, String var2, String var3, double var4) {
+      super(var1, var2);
+      this.d = var3;
+      this.e = var4;
+   }
+
+   public String c() {
+      return this.d;
+   }
+
+   public double d() {
+      return this.e;
+   }
+
+   public Double e() {
+      return null;
+   }
+}
diff --git a/testData/obfuscated/as.java b/testData/obfuscated/as.java
new file mode 100644
index 0000000..6e7c1a5
--- /dev/null
+++ b/testData/obfuscated/as.java
@@ -0,0 +1,49 @@
+import java.util.concurrent.TimeUnit;
+
+public class as extends ap {
+   private volatile long d = 0L;
+   private volatile long e;
+   private final TimeUnit f;
+   private final Double g;
+   private String h;
+   private double i;
+
+   public as(String var1, String var2, TimeUnit var3, Double var4, String var5) {
+      super(var1, var2);
+      this.f = var3;
+      this.h = var5;
+      this.g = var4;
+      this.e = System.currentTimeMillis();
+   }
+
+   public String c() {
+      return this.h;
+   }
+
+   public void a() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public void a(long var1) {
+      try {
+         if (9223372036854775797L - var1 > this.d) {
+            this.d += var1;
+         }
+
+      } catch (a_ var3) {
+         throw var3;
+      }
+   }
+
+   public double d() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public double b() {
+      return this.i;
+   }
+
+   public Double e() {
+      return this.g;
+   }
+}
diff --git a/testData/obfuscated/at.java b/testData/obfuscated/at.java
new file mode 100644
index 0000000..efafba2
--- /dev/null
+++ b/testData/obfuscated/at.java
@@ -0,0 +1,81 @@
+class at extends ap {
+   final an d;
+   private static final String e;
+
+   at(an var1, String var2, String var3) {
+      super(var2, var3);
+      this.d = var1;
+   }
+
+   public double d() {
+      return (double)an.a(this.d).getHeapMemoryUsage().getUsed() / 1024.0D / 1024.0D;
+   }
+
+   public String c() {
+      return e;
+   }
+
+   public Double e() {
+      return (double)an.a(this.d).getHeapMemoryUsage().getMax() / 1024.0D / 1024.0D;
+   }
+
+   static {
+      char[] var10000 = "$b".toCharArray();
+      int var10002 = var10000.length;
+      int var1 = 0;
+      char[] var10001 = var10000;
+      int var2 = var10002;
+      int var10003;
+      char[] var4;
+      if (var10002 <= 1) {
+         var4 = var10000;
+         var10003 = var1;
+      } else {
+         var10001 = var10000;
+         var2 = var10002;
+         if (var10002 <= var1) {
+            e = (new String(var10000)).intern();
+            return;
+         }
+
+         var4 = var10000;
+         var10003 = var1;
+      }
+
+      while(true) {
+         char var10004 = var4[var10003];
+         byte var10005;
+         switch(var1 % 5) {
+         case 0:
+            var10005 = 105;
+            break;
+         case 1:
+            var10005 = 32;
+            break;
+         case 2:
+            var10005 = 18;
+            break;
+         case 3:
+            var10005 = 31;
+            break;
+         default:
+            var10005 = 120;
+         }
+
+         var4[var10003] = (char)(var10004 ^ var10005);
+         ++var1;
+         if (var2 == 0) {
+            var10003 = var2;
+            var4 = var10001;
+         } else {
+            if (var2 <= var1) {
+               e = (new String(var10001)).intern();
+               return;
+            }
+
+            var4 = var10001;
+            var10003 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/au.java b/testData/obfuscated/au.java
new file mode 100644
index 0000000..cf88f45
--- /dev/null
+++ b/testData/obfuscated/au.java
@@ -0,0 +1,24 @@
+class au extends ap {
+   private long d;
+   private long e;
+   final an f;
+
+   au(an var1, String var2, String var3) {
+      super(var2, var3);
+      this.f = var1;
+      this.d = 0L;
+      this.e = 0L;
+   }
+
+   public double d() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public String c() {
+      return "%";
+   }
+
+   public Double e() {
+      return 100.0D;
+   }
+}
diff --git a/testData/obfuscated/av.java b/testData/obfuscated/av.java
new file mode 100644
index 0000000..ab6587d
--- /dev/null
+++ b/testData/obfuscated/av.java
@@ -0,0 +1,24 @@
+class av extends ap {
+   private long d;
+   private long e;
+   final an f;
+
+   av(an var1, String var2, String var3) {
+      super(var2, var3);
+      this.f = var1;
+      this.d = 0L;
+      this.e = 0L;
+   }
+
+   public double d() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public String c() {
+      return "%";
+   }
+
+   public Double e() {
+      return 100.0D;
+   }
+}
diff --git a/testData/obfuscated/aw.java b/testData/obfuscated/aw.java
new file mode 100644
index 0000000..2c7b400
--- /dev/null
+++ b/testData/obfuscated/aw.java
@@ -0,0 +1,361 @@
+import java.lang.management.MemoryPoolMXBean;
+
+class aw extends ap {
+   private MemoryPoolMXBean d;
+   final an e;
+   private static final String[] f;
+
+   public aw(an var1, MemoryPoolMXBean var2) {
+      super(f[1], f[0] + var2.getName());
+      this.e = var1;
+      this.d = var2;
+   }
+
+   public double d() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public String c() {
+      return f[2];
+   }
+
+   public Double e() {
+      // $FF: Couldn't be decompiled
+   }
+
+   static {
+      String[] var10000 = new String[3];
+      char[] var10003 = "6\u0000ec".toCharArray();
+      int var10005 = var10003.length;
+      int var1 = 0;
+      char[] var10004 = var10003;
+      int var2 = var10005;
+      char[] var4;
+      int var10006;
+      char var10007;
+      byte var10008;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 123;
+            break;
+         case 1:
+            var10008 = 69;
+            break;
+         case 2:
+            var10008 = 40;
+            break;
+         case 3:
+            var10008 = 78;
+            break;
+         default:
+            var10008 = 31;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label127: {
+               var10000[0] = (new String(var10003)).intern();
+               var10003 = "1\u0013e".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label127;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 123;
+                     break;
+                  case 1:
+                     var10008 = 69;
+                     break;
+                  case 2:
+                     var10008 = 40;
+                     break;
+                  case 3:
+                     var10008 = 78;
+                     break;
+                  default:
+                     var10008 = 31;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[1] = (new String(var10004)).intern();
+            var10003 = "6\u0007".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  var10000[2] = (new String(var10003)).intern();
+                  f = var10000;
+                  return;
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+            }
+
+            while(true) {
+               var10007 = var4[var10006];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 123;
+                  break;
+               case 1:
+                  var10008 = 69;
+                  break;
+               case 2:
+                  var10008 = 40;
+                  break;
+               case 3:
+                  var10008 = 78;
+                  break;
+               default:
+                  var10008 = 31;
+               }
+
+               var4[var10006] = (char)(var10007 ^ var10008);
+               ++var1;
+               if (var2 == 0) {
+                  var10006 = var2;
+                  var4 = var10004;
+               } else {
+                  if (var2 <= var1) {
+                     var10000[2] = (new String(var10004)).intern();
+                     f = var10000;
+                     return;
+                  }
+
+                  var4 = var10004;
+                  var10006 = var1;
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 123;
+            break;
+         case 1:
+            var10008 = 69;
+            break;
+         case 2:
+            var10008 = 40;
+            break;
+         case 3:
+            var10008 = 78;
+            break;
+         default:
+            var10008 = 31;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 123;
+                  break;
+               case 1:
+                  var10008 = 69;
+                  break;
+               case 2:
+                  var10008 = 40;
+                  break;
+               case 3:
+                  var10008 = 78;
+                  break;
+               default:
+                  var10008 = 31;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label65: {
+                     var10000[0] = (new String(var10004)).intern();
+                     var10003 = "1\u0013e".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label65;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 123;
+                           break;
+                        case 1:
+                           var10008 = 69;
+                           break;
+                        case 2:
+                           var10008 = 40;
+                           break;
+                        case 3:
+                           var10008 = 78;
+                           break;
+                        default:
+                           var10008 = 31;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[1] = (new String(var10004)).intern();
+                  var10003 = "6\u0007".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[2] = (new String(var10003)).intern();
+                        f = var10000;
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 123;
+                        break;
+                     case 1:
+                        var10008 = 69;
+                        break;
+                     case 2:
+                        var10008 = 40;
+                        break;
+                     case 3:
+                        var10008 = 78;
+                        break;
+                     default:
+                        var10008 = 31;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[2] = (new String(var10004)).intern();
+                           f = var10000;
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 123;
+                  break;
+               case 1:
+                  var10008 = 69;
+                  break;
+               case 2:
+                  var10008 = 40;
+                  break;
+               case 3:
+                  var10008 = 78;
+                  break;
+               default:
+                  var10008 = 31;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/ax.java b/testData/obfuscated/ax.java
new file mode 100644
index 0000000..bdb7372
--- /dev/null
+++ b/testData/obfuscated/ax.java
@@ -0,0 +1,172 @@
+import java.util.concurrent.TimeUnit;
+
+public class ax {
+   private long a = 0L;
+   private static final String[] b;
+
+   public static ax a() {
+      return new ax();
+   }
+
+   private ax() {
+      this.b();
+   }
+
+   public void b() {
+      this.a = System.nanoTime();
+   }
+
+   public long c() {
+      return TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - this.a);
+   }
+
+   public String d() {
+      return this.c() + b[0];
+   }
+
+   public String a(boolean var1) {
+      String var2 = String.valueOf(((double)System.nanoTime() - (double)this.a) / 1000.0D);
+
+      try {
+         if (var1) {
+            this.b();
+         }
+
+         return var2;
+      } catch (a_ var3) {
+         throw var3;
+      }
+   }
+
+   public String e() {
+      String var1 = this.c() + b[1];
+      this.b();
+      return var1;
+   }
+
+   static {
+      String[] var10000;
+      int var1;
+      int var2;
+      char[] var10003;
+      char[] var10004;
+      char[] var4;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label51: {
+         var10000 = new String[2];
+         var10003 = "}|".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= 1) {
+            var4 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= var1) {
+               break label51;
+            }
+
+            var4 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var4[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 16;
+               break;
+            case 1:
+               var10008 = 15;
+               break;
+            case 2:
+               var10008 = 44;
+               break;
+            case 3:
+               var10008 = 84;
+               break;
+            default:
+               var10008 = 86;
+            }
+
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "}|".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var2 = var10005;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            var10000[1] = (new String(var10003)).intern();
+            b = var10000;
+            return;
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+      }
+
+      while(true) {
+         var10007 = var4[var10006];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 16;
+            break;
+         case 1:
+            var10008 = 15;
+            break;
+         case 2:
+            var10008 = 44;
+            break;
+         case 3:
+            var10008 = 84;
+            break;
+         default:
+            var10008 = 86;
+         }
+
+         var4[var10006] = (char)(var10007 ^ var10008);
+         ++var1;
+         if (var2 == 0) {
+            var10006 = var2;
+            var4 = var10004;
+         } else {
+            if (var2 <= var1) {
+               var10000[1] = (new String(var10004)).intern();
+               b = var10000;
+               return;
+            }
+
+            var4 = var10004;
+            var10006 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/ay.java b/testData/obfuscated/ay.java
new file mode 100644
index 0000000..93a8659
--- /dev/null
+++ b/testData/obfuscated/ay.java
@@ -0,0 +1,3 @@
+public interface ay {
+   void a(a0 var1);
+}
diff --git a/testData/obfuscated/az.java b/testData/obfuscated/az.java
new file mode 100644
index 0000000..773bde2
--- /dev/null
+++ b/testData/obfuscated/az.java
@@ -0,0 +1,205 @@
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.ProcessingInstruction;
+import org.xml.sax.Attributes;
+
+class az {
+   private Document a;
+   private Node b;
+   private Node c;
+   private ay d;
+   private static final String[] e;
+
+   public az(ay var1, String var2, String var3, Attributes var4) throws ParserConfigurationException {
+      this.d = var1;
+      DocumentBuilderFactory var5 = DocumentBuilderFactory.newInstance();
+      DocumentBuilder var6 = var5.newDocumentBuilder();
+      this.a = var6.newDocument();
+      this.a(var3, var4);
+   }
+
+   private boolean a() {
+      try {
+         if (this.b()) {
+            this.d.a(new a1(this.b));
+            return true;
+         }
+      } catch (DOMException var1) {
+         throw var1;
+      }
+
+      this.c = this.c.getParentNode();
+      return false;
+   }
+
+   private boolean b() {
+      return this.c.equals(this.b);
+   }
+
+   private void a(String param1, Attributes param2) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public Node c() {
+      return this.b;
+   }
+
+   public void a(String var1, String var2, Attributes var3) {
+      this.a(var2, var3);
+   }
+
+   public void a(String var1, String var2) {
+      ProcessingInstruction var3 = this.a.createProcessingInstruction(var1, var2);
+      this.c.appendChild(var3);
+   }
+
+   public boolean b(String var1, String var2) {
+      try {
+         if (!this.c.getNodeName().equals(var2)) {
+            throw new DOMException((short)12, e[0] + var2 + e[1] + this.c.getNodeName());
+         }
+      } catch (DOMException var3) {
+         throw var3;
+      }
+
+      return this.a();
+   }
+
+   public void a(String var1) {
+      this.c.appendChild(this.a.createTextNode(var1));
+   }
+
+   public ay d() {
+      return this.d;
+   }
+
+   static {
+      String[] var10000;
+      int var1;
+      int var2;
+      char[] var10003;
+      char[] var10004;
+      char[] var4;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label51: {
+         var10000 = new String[2];
+         var10003 = "+\u0013*w'\u001b\u001e;j3^\u0018!kz\n\u001c(5w".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= 1) {
+            var4 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= var1) {
+               break label51;
+            }
+
+            var4 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var4[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 126;
+               break;
+            case 1:
+               var10008 = 125;
+               break;
+            case 2:
+               var10008 = 79;
+               break;
+            case 3:
+               var10008 = 15;
+               break;
+            default:
+               var10008 = 87;
+            }
+
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "^\u00187\u007f2\u001d\t*km^".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var2 = var10005;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            var10000[1] = (new String(var10003)).intern();
+            e = var10000;
+            return;
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+      }
+
+      while(true) {
+         var10007 = var4[var10006];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 126;
+            break;
+         case 1:
+            var10008 = 125;
+            break;
+         case 2:
+            var10008 = 79;
+            break;
+         case 3:
+            var10008 = 15;
+            break;
+         default:
+            var10008 = 87;
+         }
+
+         var4[var10006] = (char)(var10007 ^ var10008);
+         ++var1;
+         if (var2 == 0) {
+            var10006 = var2;
+            var4 = var10004;
+         } else {
+            if (var2 <= var1) {
+               var10000[1] = (new String(var10004)).intern();
+               e = var10000;
+               return;
+            }
+
+            var4 = var10004;
+            var10006 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/b.java b/testData/obfuscated/b.java
new file mode 100644
index 0000000..7fd3287
--- /dev/null
+++ b/testData/obfuscated/b.java
@@ -0,0 +1,99 @@
+import java.util.Date;
+
+public class b<K, V> {
+   protected ah a;
+   protected long b;
+   protected long c;
+   protected final K d;
+   protected V e;
+   protected long f;
+   protected long g;
+
+   public ah a() {
+      return this.a;
+   }
+
+   public long b() {
+      return this.a.b();
+   }
+
+   public Date c() {
+      return new Date(this.b);
+   }
+
+   public void a(long var1) {
+      this.b = var1;
+   }
+
+   public Date d() {
+      return new Date(this.c);
+   }
+
+   public Date e() {
+      return new Date(this.f);
+   }
+
+   public void b(long var1) {
+      this.c = var1;
+   }
+
+   public V f() {
+      return this.e;
+   }
+
+   public void a(V var1) {
+      this.e = var1;
+   }
+
+   public b(K var1, V var2, long var3, long var5) {
+      boolean var7 = d.b;
+      super();
+      this.a = new ah();
+      this.b = 0L;
+      this.c = 0L;
+      this.d = var1;
+      this.f = var3;
+      this.g = var5;
+      this.c = System.currentTimeMillis();
+      this.b = this.c;
+      this.e = var2;
+      if (ap.c != 0) {
+         boolean var10000;
+         label18: {
+            try {
+               if (var7) {
+                  var10000 = false;
+                  break label18;
+               }
+            } catch (a_ var8) {
+               throw var8;
+            }
+
+            var10000 = true;
+         }
+
+         d.b = var10000;
+      }
+
+   }
+
+   public long g() {
+      return this.f;
+   }
+
+   public void c(long var1) {
+      this.f = var1;
+   }
+
+   public long h() {
+      return this.g;
+   }
+
+   public void d(long var1) {
+      this.g = var1;
+   }
+
+   public K i() {
+      return this.d;
+   }
+}
diff --git a/testData/obfuscated/ba.java b/testData/obfuscated/ba.java
new file mode 100644
index 0000000..8c09da4
--- /dev/null
+++ b/testData/obfuscated/ba.java
@@ -0,0 +1,177 @@
+import java.util.Iterator;
+import java.util.TimerTask;
+
+class ba extends TimerTask {
+   final ae a;
+   private static final String[] b;
+
+   private ba(ae var1) {
+      this.a = var1;
+   }
+
+   public void run() {
+      boolean var4 = ae.e;
+      Iterator var1 = ae.a(this.a).iterator();
+
+      while(true) {
+         if (var1.hasNext()) {
+            ac var2 = (ac)var1.next();
+
+            label23: {
+               try {
+                  var2.a();
+               } catch (Exception var6) {
+                  r.a(b[0]).a(b[1], var2.getClass().getName()).a();
+                  break label23;
+               }
+
+               if (var4) {
+                  break;
+               }
+            }
+
+            if (!var4) {
+               continue;
+            }
+
+            int var5 = ap.c;
+            ++var5;
+            ap.c = var5;
+         }
+
+         ae.a(this.a, System.currentTimeMillis());
+         break;
+      }
+
+   }
+
+   ba(ae var1, af var2) {
+      this(var1);
+   }
+
+   static {
+      String[] var10000;
+      int var1;
+      int var2;
+      char[] var10003;
+      char[] var10004;
+      char[] var4;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label51: {
+         var10000 = new String[2];
+         var10003 = "\b[\u0006\u001d\u001b\u0000D\r\u001a\u0016(y\u0002\u001c\t\u000bL\n\u0003\u0007)".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= 1) {
+            var4 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= var1) {
+               break label51;
+            }
+
+            var4 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var4[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 77;
+               break;
+            case 1:
+               var10008 = 45;
+               break;
+            case 2:
+               var10008 = 99;
+               break;
+            case 3:
+               var10008 = 111;
+               break;
+            default:
+               var10008 = 98;
+            }
+
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = ".A\u0002\u001c\u0011".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var2 = var10005;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            var10000[1] = (new String(var10003)).intern();
+            b = var10000;
+            return;
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+      }
+
+      while(true) {
+         var10007 = var4[var10006];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 77;
+            break;
+         case 1:
+            var10008 = 45;
+            break;
+         case 2:
+            var10008 = 99;
+            break;
+         case 3:
+            var10008 = 111;
+            break;
+         default:
+            var10008 = 98;
+         }
+
+         var4[var10006] = (char)(var10007 ^ var10008);
+         ++var1;
+         if (var2 == 0) {
+            var10006 = var2;
+            var4 = var10004;
+         } else {
+            if (var2 <= var1) {
+               var10000[1] = (new String(var10004)).intern();
+               b = var10000;
+               return;
+            }
+
+            var4 = var10004;
+            var10006 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/bb.java b/testData/obfuscated/bb.java
new file mode 100644
index 0000000..48a4d9a
--- /dev/null
+++ b/testData/obfuscated/bb.java
@@ -0,0 +1,904 @@
+import org.xhtmlrenderer.extend.FSImage;
+import org.xhtmlrenderer.extend.ReplacedElement;
+import org.xhtmlrenderer.extend.UserAgentCallback;
+import org.xhtmlrenderer.layout.LayoutContext;
+import org.xhtmlrenderer.pdf.ITextOutputDevice;
+import org.xhtmlrenderer.pdf.ITextReplacedElementFactory;
+import org.xhtmlrenderer.render.BlockBox;
+
+public class bb extends ITextReplacedElementFactory {
+   public static boolean b;
+   private static final String[] a;
+
+   public bb(ITextOutputDevice var1) {
+      super(var1);
+   }
+
+   public ReplacedElement createReplacedElement(LayoutContext param1, BlockBox param2, UserAgentCallback param3, int param4, int param5) {
+      // $FF: Couldn't be decompiled
+   }
+
+   private n<Integer, Integer> a(int param1, int param2, FSImage param3) {
+      // $FF: Couldn't be decompiled
+   }
+
+   static {
+      String[] var10000 = new String[5];
+      char[] var10003 = "u\u0003\u000e".toCharArray();
+      int var10005 = var10003.length;
+      int var1 = 0;
+      char[] var10004 = var10003;
+      int var2 = var10005;
+      char[] var4;
+      int var10006;
+      char var10007;
+      byte var10008;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 28;
+            break;
+         case 1:
+            var10008 = 110;
+            break;
+         case 2:
+            var10008 = 105;
+            break;
+         case 3:
+            var10008 = 46;
+            break;
+         default:
+            var10008 = 33;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label316: {
+               var10000[0] = (new String(var10003)).intern();
+               var10003 = "o\u001c\n".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label316;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 28;
+                     break;
+                  case 1:
+                     var10008 = 110;
+                     break;
+                  case 2:
+                     var10008 = 105;
+                     break;
+                  case 3:
+                     var10008 = 46;
+                     break;
+                  default:
+                     var10008 = 33;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[1] = (new String(var10004)).intern();
+            var10003 = "h\u0017\u0019K".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 28;
+                  break;
+               case 1:
+                  var10008 = 110;
+                  break;
+               case 2:
+                  var10008 = 105;
+                  break;
+               case 3:
+                  var10008 = 46;
+                  break;
+               default:
+                  var10008 = 33;
+               }
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  label384: {
+                     var10000[2] = (new String(var10003)).intern();
+                     var10003 = "\u007f\u0001\rK\u0010.V".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label384;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 28;
+                           break;
+                        case 1:
+                           var10008 = 110;
+                           break;
+                        case 2:
+                           var10008 = 105;
+                           break;
+                        case 3:
+                           var10008 = 46;
+                           break;
+                        default:
+                           var10008 = 33;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[3] = (new String(var10004)).intern();
+                  var10003 = "o\u001c\n".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[4] = (new String(var10003)).intern();
+                        a = var10000;
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 28;
+                        break;
+                     case 1:
+                        var10008 = 110;
+                        break;
+                     case 2:
+                        var10008 = 105;
+                        break;
+                     case 3:
+                        var10008 = 46;
+                        break;
+                     default:
+                        var10008 = 33;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[4] = (new String(var10004)).intern();
+                           a = var10000;
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 28;
+                  break;
+               case 1:
+                  var10008 = 110;
+                  break;
+               case 2:
+                  var10008 = 105;
+                  break;
+               case 3:
+                  var10008 = 46;
+                  break;
+               default:
+                  var10008 = 33;
+               }
+            }
+
+            while(true) {
+               while(true) {
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                     var10007 = var10004[var2];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 28;
+                        break;
+                     case 1:
+                        var10008 = 110;
+                        break;
+                     case 2:
+                        var10008 = 105;
+                        break;
+                     case 3:
+                        var10008 = 46;
+                        break;
+                     default:
+                        var10008 = 33;
+                     }
+                  } else {
+                     if (var2 <= var1) {
+                        label492: {
+                           var10000[2] = (new String(var10004)).intern();
+                           var10003 = "\u007f\u0001\rK\u0010.V".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label492;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 28;
+                                 break;
+                              case 1:
+                                 var10008 = 110;
+                                 break;
+                              case 2:
+                                 var10008 = 105;
+                                 break;
+                              case 3:
+                                 var10008 = 46;
+                                 break;
+                              default:
+                                 var10008 = 33;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "o\u001c\n".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[4] = (new String(var10003)).intern();
+                              a = var10000;
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 28;
+                              break;
+                           case 1:
+                              var10008 = 110;
+                              break;
+                           case 2:
+                              var10008 = 105;
+                              break;
+                           case 3:
+                              var10008 = 46;
+                              break;
+                           default:
+                              var10008 = 33;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 a = var10000;
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                     var10007 = var10004[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 28;
+                        break;
+                     case 1:
+                        var10008 = 110;
+                        break;
+                     case 2:
+                        var10008 = 105;
+                        break;
+                     case 3:
+                        var10008 = 46;
+                        break;
+                     default:
+                        var10008 = 33;
+                     }
+                  }
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 28;
+            break;
+         case 1:
+            var10008 = 110;
+            break;
+         case 2:
+            var10008 = 105;
+            break;
+         case 3:
+            var10008 = 46;
+            break;
+         default:
+            var10008 = 33;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 28;
+                  break;
+               case 1:
+                  var10008 = 110;
+                  break;
+               case 2:
+                  var10008 = 105;
+                  break;
+               case 3:
+                  var10008 = 46;
+                  break;
+               default:
+                  var10008 = 33;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label129: {
+                     var10000[0] = (new String(var10004)).intern();
+                     var10003 = "o\u001c\n".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label129;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 28;
+                           break;
+                        case 1:
+                           var10008 = 110;
+                           break;
+                        case 2:
+                           var10008 = 105;
+                           break;
+                        case 3:
+                           var10008 = 46;
+                           break;
+                        default:
+                           var10008 = 33;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[1] = (new String(var10004)).intern();
+                  var10003 = "h\u0017\u0019K".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 28;
+                        break;
+                     case 1:
+                        var10008 = 110;
+                        break;
+                     case 2:
+                        var10008 = 105;
+                        break;
+                     case 3:
+                        var10008 = 46;
+                        break;
+                     default:
+                        var10008 = 33;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        label173: {
+                           var10000[2] = (new String(var10003)).intern();
+                           var10003 = "\u007f\u0001\rK\u0010.V".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label173;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 28;
+                                 break;
+                              case 1:
+                                 var10008 = 110;
+                                 break;
+                              case 2:
+                                 var10008 = 105;
+                                 break;
+                              case 3:
+                                 var10008 = 46;
+                                 break;
+                              default:
+                                 var10008 = 33;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "o\u001c\n".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[4] = (new String(var10003)).intern();
+                              a = var10000;
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 28;
+                              break;
+                           case 1:
+                              var10008 = 110;
+                              break;
+                           case 2:
+                              var10008 = 105;
+                              break;
+                           case 3:
+                              var10008 = 46;
+                              break;
+                           default:
+                              var10008 = 33;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 a = var10000;
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 28;
+                        break;
+                     case 1:
+                        var10008 = 110;
+                        break;
+                     case 2:
+                        var10008 = 105;
+                        break;
+                     case 3:
+                        var10008 = 46;
+                        break;
+                     default:
+                        var10008 = 33;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                           var10007 = var10004[var2];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 28;
+                              break;
+                           case 1:
+                              var10008 = 110;
+                              break;
+                           case 2:
+                              var10008 = 105;
+                              break;
+                           case 3:
+                              var10008 = 46;
+                              break;
+                           default:
+                              var10008 = 33;
+                           }
+                        } else {
+                           if (var2 <= var1) {
+                              label93: {
+                                 var10000[2] = (new String(var10004)).intern();
+                                 var10003 = "\u007f\u0001\rK\u0010.V".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= 1) {
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var2 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label93;
+                                    }
+
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var4[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 28;
+                                       break;
+                                    case 1:
+                                       var10008 = 110;
+                                       break;
+                                    case 2:
+                                       var10008 = 105;
+                                       break;
+                                    case 3:
+                                       var10008 = 46;
+                                       break;
+                                    default:
+                                       var10008 = 33;
+                                    }
+
+                                    var4[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var2 == 0) {
+                                       var10006 = var2;
+                                       var4 = var10004;
+                                    } else {
+                                       if (var2 <= var1) {
+                                          break;
+                                       }
+
+                                       var4 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[3] = (new String(var10004)).intern();
+                              var10003 = "o\u001c\n".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= 1) {
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              } else {
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= var1) {
+                                    var10000[4] = (new String(var10003)).intern();
+                                    a = var10000;
+                                    return;
+                                 }
+
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              }
+
+                              while(true) {
+                                 var10007 = var4[var10006];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 28;
+                                    break;
+                                 case 1:
+                                    var10008 = 110;
+                                    break;
+                                 case 2:
+                                    var10008 = 105;
+                                    break;
+                                 case 3:
+                                    var10008 = 46;
+                                    break;
+                                 default:
+                                    var10008 = 33;
+                                 }
+
+                                 var4[var10006] = (char)(var10007 ^ var10008);
+                                 ++var1;
+                                 if (var2 == 0) {
+                                    var10006 = var2;
+                                    var4 = var10004;
+                                 } else {
+                                    if (var2 <= var1) {
+                                       var10000[4] = (new String(var10004)).intern();
+                                       a = var10000;
+                                       return;
+                                    }
+
+                                    var4 = var10004;
+                                    var10006 = var1;
+                                 }
+                              }
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 28;
+                              break;
+                           case 1:
+                              var10008 = 110;
+                              break;
+                           case 2:
+                              var10008 = 105;
+                              break;
+                           case 3:
+                              var10008 = 46;
+                              break;
+                           default:
+                              var10008 = 33;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 28;
+                  break;
+               case 1:
+                  var10008 = 110;
+                  break;
+               case 2:
+                  var10008 = 105;
+                  break;
+               case 3:
+                  var10008 = 46;
+                  break;
+               default:
+                  var10008 = 33;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/bc.java b/testData/obfuscated/bc.java
new file mode 100644
index 0000000..468d25f
--- /dev/null
+++ b/testData/obfuscated/bc.java
@@ -0,0 +1,158 @@
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import org.w3c.dom.Node;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
+
+public class bc extends DefaultHandler {
+   private boolean a = false;
+   private StringBuilder b = new StringBuilder();
+   private Map<String, ay> c = new TreeMap();
+   private List<az> d = new ArrayList();
+   public static int e;
+
+   public void characters(char[] var1, int var2, int var3) throws SAXException {
+      this.a = true;
+      this.b.append(var1, var2, var3);
+   }
+
+   public void endDocument() throws SAXException {
+   }
+
+   public void endElement(String var1, String var2, String var3) throws SAXException {
+      int var7 = e;
+
+      bc var10000;
+      label63: {
+         label67: {
+            try {
+               var10000 = this;
+               if (var7 != 0) {
+                  break label63;
+               }
+
+               if (!this.a) {
+                  break label67;
+               }
+            } catch (SAXException var10) {
+               throw var10;
+            }
+
+            String var4 = this.b.toString();
+            Iterator var5 = this.d.iterator();
+
+            label55: {
+               while(var5.hasNext()) {
+                  az var6 = (az)var5.next();
+
+                  try {
+                     var6.a(var4);
+                     if (var7 != 0) {
+                        break label55;
+                     }
+
+                     if (var7 != 0) {
+                        break;
+                     }
+                  } catch (SAXException var9) {
+                     throw var9;
+                  }
+               }
+
+               this.b = new StringBuilder();
+            }
+
+            this.a = false;
+         }
+
+         var10000 = this;
+      }
+
+      Iterator var11 = var10000.d.iterator();
+
+      while(var11.hasNext()) {
+         az var12 = (az)var11.next();
+
+         try {
+            if (var12.b(var1, var3)) {
+               var11.remove();
+            }
+         } catch (SAXException var8) {
+            throw var8;
+         }
+
+         if (var7 != 0) {
+            break;
+         }
+      }
+
+   }
+
+   public void processingInstruction(String var1, String var2) throws SAXException {
+      Iterator var3 = this.d.iterator();
+
+      while(var3.hasNext()) {
+         az var4 = (az)var3.next();
+         var4.a(var1, var2);
+      }
+
+   }
+
+   public void startElement(String var1, String var2, String var3, Attributes var4) throws SAXException {
+      Iterator var5 = this.d.iterator();
+
+      while(var5.hasNext()) {
+         az var6 = (az)var5.next();
+         var6.a(var1, var3, var4);
+      }
+
+      try {
+         ay var9 = (ay)this.c.get(var3);
+
+         try {
+            if (var9 != null) {
+               this.d.add(new az(var9, var1, var3, var4));
+            }
+
+         } catch (ParserConfigurationException var7) {
+            throw var7;
+         }
+      } catch (ParserConfigurationException var8) {
+         throw new SAXException(var8);
+      }
+   }
+
+   public void a(String var1, ay var2) {
+      this.c.put(var1, var2);
+   }
+
+   public static a0 a(Node var0) {
+      return new a1(var0);
+   }
+
+   public void a(InputStream var1) throws ParserConfigurationException, SAXException, IOException {
+      try {
+         SAXParserFactory var2 = SAXParserFactory.newInstance();
+         SAXParser var3 = var2.newSAXParser();
+         XMLReader var4 = var3.getXMLReader();
+         var4.setEntityResolver(new a2(this));
+         var4.setContentHandler(this);
+         var4.parse(new InputSource(var1));
+      } catch (a_ var8) {
+      } finally {
+         var1.close();
+      }
+
+   }
+}
diff --git a/testData/obfuscated/bd.java b/testData/obfuscated/bd.java
new file mode 100644
index 0000000..11810ac
--- /dev/null
+++ b/testData/obfuscated/bd.java
@@ -0,0 +1,3487 @@
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.util.Hashtable;
+import java.util.Vector;
+
+public class bd {
+   private static String a;
+   private static String j;
+   private static MessageDigest b;
+   private static Hashtable c;
+   private static Hashtable d;
+   private static final boolean e = false;
+   private static String f;
+   private static Hashtable g;
+   private static Hashtable h;
+   private static final String x = "";
+   private static PrintWriter writer;
+   private static final String[] i;
+
+   private static void a(Hashtable var0, MessageDigest var1) {
+      var0.put(new BigInteger(i[46], 36), "\uffc0");
+      var0.put(new BigInteger(i[17], 36), "ﾏ");
+      var0.put(new BigInteger(i[96], 36), "ﾣ");
+      var0.put(new BigInteger(i[94], 36), "ￍ");
+      var0.put(new BigInteger(i[24], 36), "\t");
+      var0.put(new BigInteger(i[82], 36), i[60]);
+      var0.put(new BigInteger(i[64], 36), "\uffbf");
+      var0.put(new BigInteger(i[36], 36), "ￏ");
+      var0.put(new BigInteger(i[56], 36), i[10]);
+      var0.put(new BigInteger(i[30], 36), i[70]);
+      var0.put(new BigInteger(i[75], 36), i[23]);
+      var0.put(new BigInteger(i[47], 36), i[5]);
+      var0.put(new BigInteger(i[19], 36), "ﾖ");
+      var0.put(new BigInteger(i[2], 36), i[71]);
+      var0.put(new BigInteger(i[50], 36), "ￊ");
+      var0.put(new BigInteger(i[76], 36), "O");
+      var0.put(new BigInteger(i[40], 36), i[15]);
+      var0.put(new BigInteger(i[80], 36), i[33]);
+      var0.put(new BigInteger(i[95], 36), i[38]);
+      var0.put(new BigInteger(i[89], 36), i[69]);
+      var0.put(new BigInteger(i[43], 36), ",");
+      var0.put(new BigInteger(i[93], 36), i[77]);
+      var0.put(new BigInteger(i[62], 36), "ﾊ");
+      var0.put(new BigInteger(i[22], 36), i[66]);
+      var0.put(new BigInteger(i[14], 36), i[34]);
+      var0.put(new BigInteger(i[29], 36), i[49]);
+      var0.put(new BigInteger(i[88], 36), i[25]);
+      var0.put(new BigInteger(i[42], 36), i[39]);
+      var0.put(new BigInteger(i[45], 36), i[11]);
+      var0.put(new BigInteger(i[102], 36), i[73]);
+      var0.put(new BigInteger(i[86], 36), i[0]);
+      var0.put(new BigInteger(i[41], 36), i[100]);
+      var0.put(new BigInteger(i[74], 36), i[51]);
+      var0.put(new BigInteger(i[103], 36), i[65]);
+      var0.put(new BigInteger(i[97], 36), i[85]);
+      var0.put(new BigInteger(i[92], 36), i[104]);
+      var0.put(new BigInteger(i[13], 36), i[20]);
+      var0.put(new BigInteger(i[78], 36), i[90]);
+      var0.put(new BigInteger(i[6], 36), ">");
+      var0.put(new BigInteger(i[32], 36), "\uffdd");
+      var0.put(new BigInteger(i[63], 36), "ￛ");
+      var0.put(new BigInteger(i[53], 36), "\uffd0");
+      var0.put(new BigInteger(i[7], 36), i[12]);
+      var0.put(new BigInteger(i[54], 36), i[67]);
+      var0.put(new BigInteger(i[4], 36), "ﾗ");
+      var0.put(new BigInteger(i[3], 36), i[57]);
+      var0.put(new BigInteger(i[79], 36), "\uffd0");
+      var0.put(new BigInteger(i[16], 36), "A");
+      var0.put(new BigInteger(i[44], 36), i[18]);
+      var0.put(new BigInteger(i[31], 36), i[58]);
+      var0.put(new BigInteger(i[21], 36), i[55]);
+      var0.put(new BigInteger(i[35], 36), "-");
+      var0.put(new BigInteger(i[9], 36), i[87]);
+      var0.put(new BigInteger(i[61], 36), i[81]);
+      var0.put(new BigInteger(i[72], 36), i[48]);
+      var0.put(new BigInteger(i[68], 36), "\u0010");
+      var0.put(new BigInteger(i[26], 36), "ﾜ");
+      var0.put(new BigInteger(i[91], 36), i[1]);
+      var0.put(new BigInteger(i[28], 36), i[101]);
+      var0.put(new BigInteger(i[37], 36), "u");
+      var0.put(new BigInteger(i[99], 36), i[52]);
+      var0.put(new BigInteger(i[105], 36), i[59]);
+      var0.put(new BigInteger(i[27], 36), "ﾰ");
+      var0.put(new BigInteger(i[8], 36), i[98]);
+      var0.put(new BigInteger(i[83], 36), "\uffd0");
+      var0.put(new BigInteger(i[84], 36), "\uffde");
+   }
+
+   private static void b(Hashtable var0, MessageDigest var1) {
+   }
+
+   private static void c(Hashtable var0, MessageDigest var1) {
+   }
+
+   private static void d(Hashtable var0, MessageDigest var1) {
+   }
+
+   private static void e(Hashtable var0, MessageDigest var1) {
+   }
+
+   private static void f(Hashtable var0, MessageDigest var1) {
+   }
+
+   private static void g(Hashtable var0, MessageDigest var1) {
+   }
+
+   private static void h(Hashtable var0, MessageDigest var1) {
+   }
+
+   private static void i(Hashtable var0, MessageDigest var1) {
+   }
+
+   private static void j(Hashtable var0, MessageDigest var1) {
+   }
+
+   public static String a(String var0) {
+      if (b == null) {
+         return var0;
+      } else {
+         try {
+            int var1 = var0.lastIndexOf("[") + 1;
+            String var2 = var0.substring(var1);
+            if (var1 > 0 && var2.length() == 1) {
+               return var0;
+            } else {
+               boolean var3 = false;
+               if (var2.charAt(0) == 'L' && var2.charAt(var2.length() - 1) == ';') {
+                  var3 = true;
+                  var2 = var2.substring(1, var2.length() - 1);
+               }
+
+               boolean var4 = var2.indexOf(46) > -1;
+               if (var4) {
+                  var2 = var2.replace('.', '/');
+               }
+
+               var2 = var2 + f;
+               String var5 = b(var2);
+               if (var5 == null) {
+                  return var0;
+               } else {
+                  if (var4) {
+                     var5 = var5.replace('/', '.');
+                  }
+
+                  StringBuffer var6 = new StringBuffer();
+
+                  for(int var7 = 0; var7 < var1; ++var7) {
+                     var6.append('[');
+                  }
+
+                  if (var3) {
+                     var6.append('L');
+                  }
+
+                  var6.append(var5);
+                  if (var3) {
+                     var6.append(';');
+                  }
+
+                  return var6.toString();
+               }
+            }
+         } catch (Throwable var8) {
+            return var0;
+         }
+      }
+   }
+
+   public static String b(String var0, Class var1, Class[] var2) {
+      if (b != null && var1 != null) {
+         try {
+            String var3 = var1.getName();
+            String var4 = var3.replace('.', '/');
+            StringBuffer var5 = new StringBuffer();
+            var5.append(f);
+            var5.append(var0);
+            var5.append(f);
+            if (var2 != null && var2.length > 0) {
+               for(int var6 = 0; var6 < var2.length; ++var6) {
+                  Class var7 = var2[var6];
+                  var5.append(d.containsKey(var7) ? (String)d.get(var7) : var7.getName().replace('.', '/'));
+                  var5.append(f);
+               }
+            }
+
+            String var10 = var5.toString();
+            String var11 = var4 + var10;
+            String var8 = b(var11);
+            if (var8 != null) {
+               return var8;
+            } else {
+               var8 = a(var1, var10);
+               return var8 != null ? var8 : var0;
+            }
+         } catch (Throwable var9) {
+            return var0;
+         }
+      } else {
+         return var0;
+      }
+   }
+
+   public static String c(Class var0, String var1) {
+      if (b != null && var0 != null) {
+         try {
+            String var2 = var0.getName();
+            String var3 = var2.replace('.', '/');
+            StringBuffer var4 = new StringBuffer();
+            var4.append(f);
+            var4.append(var1);
+            String var5 = var4.toString();
+            String var6 = var3 + var5;
+            String var7 = b(var6);
+            if (var7 != null) {
+               return var7;
+            } else {
+               var7 = a(var0, var5);
+               return var7 != null ? var7 : var1;
+            }
+         } catch (Throwable var8) {
+            return var1;
+         }
+      } else {
+         return var1;
+      }
+   }
+
+   private static String b(String var0) {
+      String var1 = (String)g.get(var0);
+      if (var1 == null && var1 != "") {
+         b.reset();
+
+         try {
+            b.update(var0.getBytes(j));
+         } catch (UnsupportedEncodingException var4) {
+         }
+
+         byte[] var2 = b.digest();
+         BigInteger var3 = new BigInteger(var2);
+         var1 = (String)c.get(var3);
+         if (var1 != null) {
+            var1 = a(var0, var1);
+            g.put(var0, var1);
+         } else {
+            g.put(var0, "");
+         }
+      }
+
+      return var1 == "" ? null : var1;
+   }
+
+   private static String a(String var0, String var1) {
+      b.reset();
+      byte[] var2 = null;
+
+      try {
+         var2 = (var0 + a).getBytes(j);
+      } catch (UnsupportedEncodingException var9) {
+      }
+
+      b.update(var2);
+      byte[] var3 = b.digest();
+      char[] var4 = var1.toCharArray();
+      StringBuffer var5 = new StringBuffer(var4.length);
+
+      for(int var6 = 0; var6 < var4.length; ++var6) {
+         char var7 = var4[var6];
+         byte var8;
+         if (var6 < var3.length - 1) {
+            var8 = var3[var6];
+         } else {
+            var8 = var3[var6 % var3.length];
+         }
+
+         var5.append((char)(var7 ^ (char)var8));
+      }
+
+      String var10 = var5.toString();
+      return var10;
+   }
+
+   private static String a(Class var0, String var1) {
+      Vector var2 = b(var0);
+      int var3 = var2.size();
+
+      for(int var4 = 0; var4 < var3; ++var4) {
+         String var5 = (String)var2.elementAt(var4);
+         String var6 = var5 + var1;
+         String var7 = b(var6);
+         if (var7 != null) {
+            return var7;
+         }
+      }
+
+      return null;
+   }
+
+   private static String a(Class var0) {
+      return d.containsKey(var0) ? (String)d.get(var0) : var0.getName().replace('.', '/');
+   }
+
+   private static Vector b(Class var0) {
+      String var1 = var0.getName();
+      Vector var2 = (Vector)h.get(var1);
+      if (var2 != null) {
+         return var2;
+      } else {
+         Vector var3 = new Vector();
+         Hashtable var4 = new Hashtable();
+         b(var0, var3, var4);
+         h.put(var1, var3);
+         return var3;
+      }
+   }
+
+   private static void b(Class var0, Vector var1, Hashtable var2) {
+      Class var3 = var0.getSuperclass();
+      if (var3 != null && !var2.containsKey(var3)) {
+         var1.addElement(var3.getName().replace('.', '/'));
+         var2.put(var3, var3);
+         b(var3, var1, var2);
+      }
+
+      Class[] var4 = var0.getInterfaces();
+
+      for(int var5 = 0; var5 < var4.length; ++var5) {
+         Class var6 = var4[var5];
+         if (!var2.containsKey(var6)) {
+            var1.addElement(var6.getName().replace('.', '/'));
+            var2.put(var6, var6);
+            b(var6, var1, var2);
+         }
+      }
+
+   }
+
+   private static String c(Class var0) {
+      return var0.getName().replace('.', '/');
+   }
+
+   static {
+      String[] var10000 = new String[106];
+      char[] var10003 = "ￖ\"".toCharArray();
+      int var10005 = var10003.length;
+      char[] var10004 = var10003;
+      int var12 = var10005;
+
+      int var2;
+      char var10007;
+      byte var10008;
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "aq".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[1] = (new String(var10004)).intern();
+      var10003 = "\u0005c(\u001f_X~+G\u0007\u001000\u0007\u0007\\k%B^K34\u001f@Oa7\u001dY\u001ak.\u001fE\u001dj5N^@?5\u000eBJ6(O\u0006\u001dq5\u0018\u0004\u001efv\u001eEJa0G\tE~#\u0002\u0004^k;\u0018\tIn%@_N08\u0011AOe.\u0014T]09\u0001I\u001ej&\u001a@".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[2] = (new String(var10004)).intern();
+      var10003 = "\u000537\u000e\\[b&\u0006Z_cr\u001f\u0006B?-\rK\u001a0p\u0011_AwpFEFvr\u0007D\u0011w3\u0014RPm'\u0018Y\u0011vq\u0015[Ba'AH\u001a?%\u0001\u0004Ca3\r\u0003O?;D[Gh6CV\u001cw3\u0010\u0000YwxC@L}9\u0005C]}4\u0015\u0005^38\u0010\\".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[3] = (new String(var10004)).intern();
+      var10003 = "\u000533\u000f\u0004Y0q\u0015WZe7\u000fKYb6NDL\u007f7\u001bPId,NYD0s\u0010@Djw\u0016UM3+\u0019\b\u001b?v@UL`t\u0019^\u001a?&FE\u001db1\u0016V\u001f10\u000f\u0000Nm.ER]q8@R\u001e37A\u0005\u001dfy\u0000@\u0018b)\u000fEJa \u001c".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[4] = (new String(var10004)).intern();
+      var10003 = "￥￡".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[5] = (new String(var10004)).intern();
+      var10003 = "\u00053w\u0015X\u001e4#\rSK`2\u0003]Cr&\u001fI_b)\u001eDPbxDTO1;OEZq$\u001e\u0006Ojv@T\u0011mx\u001d\u0000\u001cp.\u0007\u0005Ed&\u0006F\u001enp\r\t\u001c?&\u0015XJ?'OT^ev\u0015\u0002F60\u0010RBk&\u0007F_32\u0005W\u001fb8F@".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[6] = (new String(var10004)).intern();
+      var10003 = "\u001ev5\u0006P\u001b>&\u0007H@7-GCI>)\u0007S\u001ej;\u0010UMm AYO2#\u000fZ\u001e7s\u001cS\u0010oq\u001fVFu\"DWG?'OZ\u0011`&\u0013\t]fw\u001aH\u0019o$DWG~&@^P7rDK\u0018q$FPL}2A\u0001No \u0018PLjv\u000e".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[7] = (new String(var10004)).intern();
+      var10003 = "\u00054r\u0007YI4,\u0018RZ~(\u0001K\u00187x\u001aC]e8\u000e\u0004\u00117/FRMmuNK\u0010k'\u001cP\u0019fp\u001ePK5)@\t_os\u001f\u0003J~/@P\u001cm7\u001fG\u0010`+\u0015\u0005\u0010tx\u0011IPk/\u001f\u0004@isC\t\u001c0rCY\u001auqC\u0000\u0010n7\u001aT".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[8] = (new String(var10004)).intern();
+      var10003 = "L3t\u0019ZB30\u0014\bNs6\u0010\u0002Z1$\u001aVI09\u000eU]30F\u0004\\qvN\\_o9BK\u001f\u007fw\u0006DFb-N\u0002[5'B[[00\rZNb O\u0006\u001ew2\u0002[Ltp\u0013\u0003G~qO_Qe)\u001eSLh0\u001a\\\u001bs9\u0013B\u0010ds\u0012".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[9] = (new String(var10004)).intern();
+      var10003 = "￡ﾚ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[10] = (new String(var10004)).intern();
+      var10003 = "\ufff0\u0007".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[11] = (new String(var10004)).intern();
+      var10003 = "ﾯ>".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[12] = (new String(var10004)).intern();
+      var10003 = "\u00052+\u0019\u0000Jrp\u001a]^k6\u0010CJa8\u0015DXbyFY\u0018bx\u001a\u0007O0v\u0005CD0y\u0014[Np1\u0004XKm8\u0012\u0007Ri2\u0018\u0000Rax\u001bH\u0010`#\u0003\u0006Pp6\u001e\u0001Aa%DYG0#\u0001KJmy\u0002WX6p\u0018E\u0010`5\u001c\u0002C}r\u001b\u0002".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[13] = (new String(var10004)).intern();
+      var10003 = "\u0005dv\u0000GGl(\u001aE\u00192-\u0014U\u0011t8\u0013\b\u0019c-\u001e]Eq$\u000fV\u001av/CX\u001ev'\u001e\\Q}3\u0012ZCmv\u0002X\u0019b6\u0018RFc)\u0007\u0007\u001c`7\u0003XKiy\u0006BYo0\u0016\u0004@c4\u0010\u0001BhrE\u0004[i\"\u0012C[au\u0000SPsw\u001aW".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[14] = (new String(var10004)).intern();
+      var10003 = "\uffc1\ufff4".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[15] = (new String(var10004)).intern();
+      var10003 = "It#\u001c\tOa1\u001b[Km4\u0001\u0004Eq6\u0003@\u001bi.\u0005C_n;\u0015[Dfr\u0001\u0005Ri*\u0013\u0004B0*\u0002]Js,\u000fFP25A_D>;\u0012SDju\u0010^\u0011e7GY_k-\u0001Z\u001d>9\rI^?4\u0004DK}4\u001e_Z6#\u0012EX0u\u000e".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[16] = (new String(var10004)).intern();
+      var10003 = "\u00051+OT_d$\u0016F\u0019n*\u0006\u0005\u001ae(\u000f_J~wG\u0000\u001ee1@R]>u\u0019\u0004RpwNUJ2t\u0007\u0001Ol,\u0004RAp4\u0006GZ79\u0011F\u0011n7\u0001\u0005^cvB\u0007Ou$\u0002EQ}q\u0007ZOw&\u0007ICo3\u0014[\u001ft,EB\u001bnx\u0002S".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[17] = (new String(var10004)).intern();
+      var10003 = "ￃﾾ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[18] = (new String(var10004)).intern();
+      var10003 = "Ah,\r\u0006Qq+\u0018]Gn9\u001eG\u00111p\u0004XBr0O\u0001Fj+CK\\rsCU\u001f4p\u001cSD7r\u0005KL2vDYYi/\u0012\u0002B0s\u0005VYuv\u0000VZ2%\u0007TI3'\u0006V\u001b31\u001aW\u00183+\u0011W\u0011v;\u0002\u0000Jc-\u0015\u0007\u001dn3B".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[19] = (new String(var10004)).intern();
+      var10003 = "�\u001e".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[20] = (new String(var10004)).intern();
+      var10003 = "\u0005mq\u0014SOt-\u001a\u0003[~p\u001dPD}*\u001e\u0001Fl'\u001aA\u001b58\u0006KOrv\u000fUF\u007f'\u0010_Mj,\u001d\t\u001bs-\u0006\u0004\u001ej3\u0005E_v2\u0002\b\u0011\u007f \u0010@Etw\u0007\\Oet\u001c\u0003\u001dl \u0002CA30\u001a\u0002\\u(EUEn C\u0004\u001f?;O\u0000".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[21] = (new String(var10004)).intern();
+      var10003 = "C2/\u0013\u0007Dq1\u0019WY09FWYo7NE\\b3\u001dEXlx\u0003W\u001frw\u001a\u0005Yn/\u0015ZJm.@\u0007\u001fr4E\t\u001e4(\u0013\t\u0010k2\u001fVM0%\u0005PF0(@F\u001f12\u001bPKp9\u001eHYu\"O\u0002\u001c~;@\u0006Rk AW]uy\u0006".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[22] = (new String(var10004)).intern();
+      var10003 = "Jￚ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[23] = (new String(var10004)).intern();
+      var10003 = "\u001eq%\u001b\u0004F06N\u0005\\?5FT_n3\u0007\u0003@a%NZ\u001d\u007f1\u0002\u0007IlxN\u0000@>pBILj+\u0018GGu;@R^pp\u0000SC2*\u0004\u0003\\3#\u0007WAa9\r\u0007\u0018m/\u0006\u0000A?+DF\u001bn)\u000fW[74\u001bR\u0011qt\u0015W]\u007fx\u001e".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[24] = (new String(var10004)).intern();
+      var10003 = "ﾫﾾ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[25] = (new String(var10004)).intern();
+      var10003 = "\u00050%\u001aU\u001f`+EDFm\"\u001cDXc,\u001aTN\u007f#\u0004\u0001A~ \u0014YAq9\u001dC\u00105r\u0015SNb-E\t]`)\u0002@^>;\u0006XZkr\u0005\\^0\"E^_6)\u0013\u0004X>$\u0001@Eu/\u0003A_r$DIJ\u007f+\u0003\u0001AhrE\u0000E5w\u0014T".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[26] = (new String(var10004)).intern();
+      var10003 = "\u000533O\bBa%O[\u0011q'\u0015Z@r(D\t\u001b61\u0013PA?*\u0014_\\d5\u0015HAqu\rFE\u007f4\u001cS^24\u0007\u0003\u00112q\u0014@\u0011l(\u001b\u0007\u001cs5\u0001\bI?$BINs\"\u0010SXv+NZ]d/\u0019EFr$\u000eEKws\u001bB\u001c4 \u0014A".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[27] = (new String(var10004)).intern();
+      var10003 = "No*\u0006GG4q\u001b\t\u00116t\u0019RD}p\u0019FO>'GFQ4/\u001bCP`)\u0002[Dk7B\u0003I1uCZD>9\u0003K\u0019i%G@O`.\u001cY\u0011n-\u0004V\u001dpu\u0018WY?+\u0005GG~7\u0002A]c*OFCm,\u0012\u0006\u001c7y\u0006\u0003N40\u0005".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[28] = (new String(var10004)).intern();
+      var10003 = "\u001abp\u0019X\u0018a$OT\u001bq)\u0006\u0001Art\u0001FX6 \u0001BX~p\u0014PDd;\u0001XPp5C@Bfy\u000fW\u0018m)\u0000\u0002E`-\u0018WNmx\u0014\\Gu+\u0002S\u001a`&\u0014\u0005\u001bbw\u0010\u0004\u0010a*\u001f\tN5#@ILe(\u0014BOt.\u0018IRi(\u001f".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[29] = (new String(var10004)).intern();
+      var10003 = "\u0005?uCSPk&\u0003V\u001fbr\u0019R[nt\u0010CYv%AIMtw\u0005H\u00101)\u0012\u0005\u0019tq\u0000YEp$\u0004\b\u0019jx\u0012I\u001aos\u0010\u0006\u001e3x\u0012PDq'FZCt2\u0019CZi&DX_? \u0014S[p9@\tDaw\u0003AIa-\u001eYFqu\u0010".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[30] = (new String(var10004)).intern();
+      var10003 = "\u0005j4N@Ct*GI\u0010c-\u0014UCat\u001eI_5;\u0016^\u001ee2OS\u001eq \u0002XB3,\u0019T\u001cwt\u0002]B7s\u0015\tM?%\u0014[A0.\u0005\u0003Aq%\u001eXQ22@CPa1\u0010\t\u001cl'\u001d\bNu(\u0014SOh7G\u0003X0/\u0003FMh7\u0007".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[31] = (new String(var10004)).intern();
+      var10003 = "\u0005`7\u0018ZYo A\u0005X2'\u0007^_s8GR\\>(D@]tr@\u0007@>0\u0018DK2+\u000fBC5q\u0007\u0007\u001epq\u001c\\P30\u0006IEp#\u0001G\u00112-\r\u0001\u001ajw\u001dIL1wNIE~3BXZ?#O@Os0EA\u001em(\u000f\u0005\u00105tN\u0004".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[32] = (new String(var10004)).intern();
+      var10003 = "ﾖx".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[33] = (new String(var10004)).intern();
+      var10003 = "5ﾸ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[34] = (new String(var10004)).intern();
+      var10003 = "K3sDG\u001av(\u0015\\Mi*\u0014\u0000\\0,\u001dF^s(E\u0005Qp.DK\u001d}5\u000e\u0007Rey\u0006KGe%\u001cHM03CARr(\u0012S@f/\u000fK\u001106@\u0003_i%\u000e\\Rt6\u0004U\u001ab,\u0019\\Xi$@\t\u00115-\u0016\t]31N]\u001d\u007f9\r".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[35] = (new String(var10004)).intern();
+      var10003 = "\u0005?t\u0014\u0004\u001fl+\u000f@Gk*\u0005EKa0\u0013T\u001dr*G\bXes\u001e\u0000P}-C^@u6\u001cH\u00116&NG\u0019v+AV\u001c}6\u000f[Cq\"\u001f\t\\68\u0013\t^\u007f%\u0015\u0006Ge'\u0015RErp\u0005ZZ7+\u001cFJm%\u001d\u0003Q67ADIaxO^".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[36] = (new String(var10004)).intern();
+      var10003 = "\u001a06\u001cFE0.F[Zq%GHCtq\u0007\u0002\u0011~+\u0006TDf*\u0010\u0001C>#B\u0000^ps\u000fKMc.\u0011DO2r\u0019A_ap\u0011AMw0G\u0000Am5A@A>1\u0016@Ot,\u0002]Lu8\u000e\u0000Rv-\u0019P\u0019h4\u000e^\\4'BVZ\u007fu\u0001".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[37] = (new String(var10004)).intern();
+      var10003 = "k￣".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[38] = (new String(var10004)).intern();
+      var10003 = "\uffc1ﾡ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[39] = (new String(var10004)).intern();
+      var10003 = "[79\u0019R\u001fd;E\u0004F\u007f @YX06\rWC0x\u001bW_t\"\u0005X\u0011o8\u001fFX6uA\u0004]v\"\u001e\u0004Me3\u001eAM~/DDB41\u0004\u0005@c0EXXh.\u0012B]uw\u0002AA44\u000e_\u0018e(\u0003EF3p\u0006BB41\u0015K\u001048".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[40] = (new String(var10004)).intern();
+      var10003 = "\u0005>p\u001fPA7+\u001fK\u001c0*\u0010\u0000\u0011k \u0014H\\cxNWNs*\u0000C\u001c6.@]]m,OBZv0\u0007\u0002Fsu\u001fWF3rOXE?x\u000e\u0005Pj,F\\C0p\u0002[O42\u001a\u0001Qm0BU\u001f`8\u0018\\E}1E\u0000\u0010lv\r\t\u00100;\u0015\u0004".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[41] = (new String(var10004)).intern();
+      var10003 = "\u0005o3\u0018FA37\u0012AM6w\u001cXCk+\u0013\u0000^my\u0015UOnw\u0003SYj1\u0010AZ5'\u0014X\u001ap5\u001dFEmr\u0003]@qvF\u0002Z~xOXR72E\u0001\\v/AH\u001bv$CC@v+\u0015BB08\u0007\u0004Qi;\u0013W\u001ddw\u0000S\u0010j;\u0000B".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[42] = (new String(var10004)).intern();
+      var10003 = "\u0005>pB\u0004Q1w\u0019WI?\"\u0012\u0005On+\u0007IJf)\u0013FYe,\u0014\u0003Ad%\u0013KL2'\u001f@C0#\u0012\u0000[sy\u0018W[t'\u0012ZR0r\u0011A\u0018ew\u0011AGp)\u001aTL}vC__up\u001f\u0001M>\"A\u0004P},GKBu3D\t\u001928\u0011\u0005".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[43] = (new String(var10004)).intern();
+      var10003 = "Mep\u0005BNh)FT\u0018d6NIKa4\u0003W\u001d`(\u0004[Pb7\u001dWLd*\u0004FKo.\u001aZOh1\u0013[Zt*FK_m;\u001e\u0000\u001fe6\u0003\u0000C\u007f&\u000eUG2p\u0016UR3vO\u0006Dd3\u0005[Yl$DC^~t\u0003\bQb2\u000fCD?5\u0007".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[44] = (new String(var10004)).intern();
+      var10003 = "\u001c2,\u0003@EqqOP\u0010mt\u0003WQ}8\u0014\u0001L4*\u0004AK50\u0012XI}w\u0015\t@0)FH^q\"\u0018V\u0019r#N\u0003R7q\u000fV]ft\u0004H\u001d?$\u0014\\J~/\u0005\u0002G0v\u0006RIw'\u001d_\u001c7.\u001e\u0003Y>9\u001aTYh7\rC_m8\u001d".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[45] = (new String(var10004)).intern();
+      var10003 = "\u000506DG\u001dk\"\u000f\u0000Fl \u0011[\u001d>$N^@ht\u0000]Gv\"\u0006[Ev;\u0013HMr\"\u0003\bA71\u0012_Ci*\u001fE\u001e}.\u001dVC6r\u0007K\u0011?\"G\u0007I?tA_\u001awq\u0013RRtu\u0001\u0002D02DFL>3\u0015F\u001d3t\u0014P\u001fh9\u001f\\".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[46] = (new String(var10004)).intern();
+      var10003 = "Je8\u0000^\u0018fp\u0000[F5uAT\u001auqN^Il3OKDm6\u001bEZu+\u001e\tB7v\u0010\bEuw\u0010\u0006\u001cmw\u000e\u0006Kru\u001c\u0001N\u007f(@W\\6.\u0011G\u0018hv\u001aCJw(\u000eT@f'\u0007WOu4C\u0003Njq\u001d\t\\h;\u0004W\u001da\"A".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[47] = (new String(var10004)).intern();
+      var10003 = "?\uffc8".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[48] = (new String(var10004)).intern();
+      var10003 = "L￡".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[49] = (new String(var10004)).intern();
+      var10003 = "Id)GI\u001b5&\u0006TY1y\u000fPDh7\u001a@R29\u0016[Ae*\u000fWL7t\u0013T\u001fp6E\u0005\u0019ayG\u0006\u001abq\u0001]Kv.\u001fTF5/\u0003\u0001Rb4\u0011FDv\"ES^}q\u0016TOr2\u0019\u0006\\v(\u0002F]}(\u001aFQ>+\u001dXPl)\u0004".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[50] = (new String(var10004)).intern();
+      var10003 = "mc".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[51] = (new String(var10004)).intern();
+      var10003 = "ￂ￥".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[52] = (new String(var10004)).intern();
+      var10003 = "\u0005o9\u0005\u0000_h4\u0016RK1y\u000e@_\u007f0\u0006\u0007\u0019n+OHN~*A\u0004Ap/\u001cUZ\u007f.EICc4\u0019IXa2\u0000WL};\u0019BCa0\u0001\u0006\u001a\u007fp\u0010A\\?v\u0001\u0001Frw\u0010I\u001fmuF\u0004\u001d`%\u0007G^j)\u0003\u0001E\u007f+\u0002EBi5N\u0006".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[53] = (new String(var10004)).intern();
+      var10003 = "@68\u001cE_3(D\u0001\u0010k%\u0002\u0001\u001erq\u000eVA~0EHKw0\u0018@Af9\u000eFPep\u0007_\u0010h0\u0005\\Inr\u0014\u0007^b0\u0013\\\u001c54\u0006\u0005\u001e~%\u001eU@nx\u000e[\u001de'\u0013@]w#D\u0005\u0010jx\u001fK\u001bi;\u0007AR24\u0011\u0006OvtD".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[54] = (new String(var10004)).intern();
+      var10003 = "9-".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[55] = (new String(var10004)).intern();
+      var10003 = "N77\u0014\u0003Na#E\u0006FmuA\\\u0011?v\u0004DYu\"\u0011KK>+\u000e\u0007\\iv\u0015K\u001fsp\u0007[E07\u0019POu.\u0003EBvvF[\u00113w\u0005\\Lr#DTC\u007f1\u0007\u0005Qv/\u0014\u0002Kr%\u0014P\u0019pv\u0002FG60DS\u001d`1E\u0003\u001a7q@".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[56] = (new String(var10004)).intern();
+      var10003 = "\u0017\uffdf".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[57] = (new String(var10004)).intern();
+      var10003 = "|ﾇ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[58] = (new String(var10004)).intern();
+      var10003 = "\b\u0002".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[59] = (new String(var10004)).intern();
+      var10003 = "ￍﾭ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[60] = (new String(var10004)).intern();
+      var10003 = "A3%\u0001^\u001eo9\u001aX^k0CDIt7\u0006^C6p\u0012KQks\u000e_]r(D]Ko#\u0014G_a8\u0016CO7.AV]57\u0015\b\u0018?;\u000e_\u00184rEI\u001bh5\u0005IL02\u001aSMs(FYAkt\u0010PMo&EB\u001921\u0000^C?(E".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[61] = (new String(var10004)).intern();
+      var10003 = "\u0005et\u001d\t\u001a}%E\u0005\u001eoq\rE\u001fwp\u0006_I3)\u0010\u0001N`1\u0007U_4w\u0004X\u001b72\u0007PA~v\u0006EDwv\u001fR@>7\u001dXLv$\u0003C\u0019dx\u0012\u0007\u001dw-\u0015\\@1#\u0002EQj2GWM\u007f9\u0006E@k7\u0005\u0004]l4\u0019K\u001ctw\r\u0001".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[62] = (new String(var10004)).intern();
+      var10003 = "Lrx\u0010W]o \u0000@P~6\u0011\u0000[j3\u001cCZ\u007f%\u0007FZt \u001b\u0005\\>(A\t\\~tNH\u001ft/\u0015REp6\u0002FMq9FIDu*\u0015P\u001cl#@[O?5\u0003\u0004\\e(\u001dR\u001dl8\u0005UJs7\u0018FFe;\u001cDD?8\u0006\u0007Cl%\u001f".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[63] = (new String(var10004)).intern();
+      var10003 = "\u0011k6GA[30\r_B>y\u001aEDtu\u001aCK73\u001fTEj/\u0001]Fs4\u001b^G~(CD\u001cv*BD\u001ab1\u001bB\u0019dx\u0010\bE3rCXLw;\u0013H_k%\u0000H\u0011p;\u0015\u0005Jf(\u0019IK6q\u001bS\u001bktFW^e\"\u0007EXh&\u001f".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[64] = (new String(var10004)).intern();
+      var10003 = "￡￫".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[65] = (new String(var10004)).intern();
+      var10003 = "\u0014\t".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[66] = (new String(var10004)).intern();
+      var10003 = "],".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[67] = (new String(var10004)).intern();
+      var10003 = "L09\u0004PE76DEF\u007fr\u0019^\u001a3+\u001f\u0000\u001bm+\u000fYOr(E\bMay\u000eZ_qs\u001dSK3;A\\Ptt\u0001RZi-N^Zt\"D[Kr6\u0002\u0003\u001bm6G[^a#\u000eSF\u007f#\u0012VN}2DSM32\rC]1;\u0007H\u001dhu\u000e".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[68] = (new String(var10004)).intern();
+      var10003 = "ﾈﾯ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[69] = (new String(var10004)).intern();
+      var10003 = "ﾧ(".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[70] = (new String(var10004)).intern();
+      var10003 = "ﾺ3".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[71] = (new String(var10004)).intern();
+      var10003 = "Ii&\u0018\u0001Ywp\u0004CYdv\u0006\u0004^n1\u000eU\u001ajw\u0000[\\tuNS\u001app\r\u0003^l4@]G1vBGLs8\u0014DN7u\u001e_\u0018tp\u0000\\Oq-GS\u0019n.\u000f\u0006Xk\"\u0011Z\u0018>w\u001a[\u0010hr@IE~5\u0001\u0007\u001brw\u001eBD75\u0011".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[72] = (new String(var10004)).intern();
+      var10003 = "ￏￅ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[73] = (new String(var10004)).intern();
+      var10003 = "I75OZMr.\u000eB^f-\u0015\u0004]m'\u0015\u0001Ei0\u0018_E01EKQw-\u0002\tG`1\u0007\u0001\u001ah/\u0007^NauB_\u0018d#FXBhv\u0011CEsu\u001aSE18@AF0#C\u0002@70\u0007[Al&\u001cT\u001fwv\u0010Z_os\u0018ZC}yE".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[74] = (new String(var10004)).intern();
+      var10003 = "\u0005b/N\b\u0018q.\u001d\u0002\u0019e.C\\]r$OBP>2A\b\u001de#\u001fT\u001b59\u0002G\\2p\u001d\bN`/\u0016\u0000Pp8\u0018PBo0\u000e\u0006Xa'\rE^d2\u0013R\u001cr&CC\u001ckv\u0004IAd6\u001dCAl-\u0015VNs8\u001a\u0007P`(\u0015\u0000Nj&\u001b^".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[75] = (new String(var10004)).intern();
+      var10003 = "Lk8\u0001@\u001eby\r^Ao,\u000fV\u001ewq\u0015EJ3&@\u0003Yq\"FP\u0010t\"\u0018F^0qAVO~+\u0000VY`s\u000fI\u001ei3OKMrs\u0006^Lj5\u0002\\\\f\"\u000e\u0000Kc0\u0004\u0001McxOKM?p\u000e@^w&\u0002Y\u001bdyGGDcq\u0001".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[76] = (new String(var10004)).intern();
+      var10003 = "$\u0007".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[77] = (new String(var10004)).intern();
+      var10003 = "\u00054,\u001cD\u0018m,\u001dX\u0018dy\u0010[P7.\u0012P[n8\u000f@Gj4\u0019\u0002\\o0\u0005]Y49\u0016\t\u0018o&\u001dR\u0019q(\u0011K\u001er7GX\u001bd/\u001bT\u00185x\u0010PKl.F[D6/\u0011\u0003O>)\u001e\u0006\u0011cyNZPc,\u000e^\u001fj*G_Xd \u0011G".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[78] = (new String(var10004)).intern();
+      var10003 = "\u0019j;\u000e\u0006\u001cq2\u001e\u0004Q?q\u0000A\u001eu FU\u001csw\u0007R\u001ff4\u0014\u0004\u0011r$\u000eW\u0010a)\u0018C[\u007fxG^B0%ED]59OSRkrA\u0001Jh0\u0012Z\u0010u;\u0019A\u001cqs\u0000\\\u001f50\u0014\u0005\\v/\u0000\u0007\u001ampC\u0002Is&\u0013\u0005X>5\u0016".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[79] = (new String(var10004)).intern();
+      var10003 = "\u000511\u0019]\u0019l)@X^ku\u000eAQv(\u0003]Ylp\u001fSN?\"C\t_b#DII`s\u0014DMdp\u0012R\u001bh*\u001b\u0000G>\"\u0018KGr-\u001a_Gnv\u0014W\u001af*\u001e\u0000\\j/\u0002V^04\u0005IO~.@D\u0010`.CH\u00182/\u0005XL53\r\t".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[80] = (new String(var10004)).intern();
+      var10003 = "~x".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[81] = (new String(var10004)).intern();
+      var10003 = "\u001c1'\u0019YQj/\u0002A\u001b2 D\u0000Q`6\u000fP\u001bf/\r\u0004Cf3CZ^2.OVN5vAPMt \u001fX\u001e},\u0015\u0003\u001en4\u001e\u0004El1\u0014B\u0010r(\u0005FLsqCKAr.@\tNl1\u0013XDsx\u0010Z\\71@\tL0wFRY3v\u0002".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[82] = (new String(var10004)).intern();
+      var10003 = "\u00053*\u0012\u0004Rn+\u0018IM\u007f*\u0003\u0001Lsu\u0004T\u001fnp\u001b\u0006N} \u0016HPw4C\bAaw\u0018\u0003Asp\u0010\u0006\u0010}r\u001f_C24\u000fAN3qD\u0000Nms\u0006\u0001Rv\"@@Z4(\u001d\u0002\u00185;\u0003\u0000X7.A\u0005L63\u001a[Ke%\u0010Y\u001dd.GG".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[83] = (new String(var10004)).intern();
+      var10003 = "\u0005n6\u000fR\u00196q\u0007^]a \u0000_K4q\u0015[Ybu\u0015V\u0019s\"\u0010WM67\u0005KPf0\u001dVKuu\u001cZI\u007f7EB\u001a7+\u001bK^50OPGa+\u0003SPd$GWJm%\u0019VJdv\u0019\u0003@0r\u001c@\u00184vD^\u0011k3\u0012[@6#\u0015\u0006".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[84] = (new String(var10004)).intern();
+      var10003 = "ￎ,".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[85] = (new String(var10004)).intern();
+      var10003 = "\u00055-\u001bDMp6\u0011B\u001c4)B_@k0\u0002\u0000\u001f`pDD\u001am \u0015\u0002Qjp\u0015XDe-\u001dP\u001ch2\u0005\u0006M18\u0004][u&\u0001I\u001bf*\u0000BBe6\u000e^Zo\"\u001bH^7\"\u0004]La5A[Ks)\u0016_J0r\u0018@\u0019?3\u000eW@`5\u0015[".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[86] = (new String(var10004)).intern();
+      var10003 = " ﾡ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[87] = (new String(var10004)).intern();
+      var10003 = "\u0005a'\u0013]Ed(\u0006VBv/\u0011GL61\u0001K]s5D\b\u001ba8\u000f\\D1s\u0007WDr(BC\u001er'\u0012YOp(\u0011GA1x\u0015\u0001[1.G\\Dj&\rBNk*\u0007YJb/\u0006]Ir.\u0013@Jq0\u0015\u0007\u001avp\u001bD^56G@_3)\u0005\t".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[88] = (new String(var10004)).intern();
+      var10003 = "\u0005d(\u0002B\u001ft3AI\\k0\u0019PO?.\u0019PRb.\u0003TIep\u001b\\GvrGCMwt\u0016XAty\u0006\u0003\u0011}s\u0006[Ao-\u001f\b\u001ahx\u0006WLl2\u0000@_w&\u000f\u0004Mu$\u001f^E>/\u0007Y\u0018v9\u0003R]f,\u0004\u0003@u)\u0013\bOm'DB".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[89] = (new String(var10004)).intern();
+      var10003 = "ﾘﾒ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[90] = (new String(var10004)).intern();
+      var10003 = "@`#\u0018\u0004Qa6\u0018\\Btq\u001a\u0001\u0010a3\u0013I\u001b1&E\bAqy\u0000]\u0010h7\u0005WG07\u000f\u0005Yj,\u000eX\u001c4-\u0012H\u001da5\u0001AI74@R@~\"\u0013TO>,\u0000R\u001cc-\u001bIK5#\u001e\u0006\u001ctq\u0006YD6&O\\_\u007f)\u0004\\Aa7\u001d".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[91] = (new String(var10004)).intern();
+      var10003 = "\u0005dr\u0004\u0006\u001cjw\u001fS\u00113/\u0007G\u001834\u001eIE53\u0018P[>;\u0016\u0003Qe9\u001a\u0007Idy\u001eYA?/E\u0006Ci,A^Cur\u000e@\u0010w9\u0019WI44\rH\u001afqG\u0007]wwO\u0003Gq0\u0011SYs%\u0019\u0005^60\u001c]_0s\u001cD\u001d2y\u0011D".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[92] = (new String(var10004)).intern();
+      var10003 = "\u0005rx\u0001\t\\}1CP@w;\u001bED4\"\u0013_Z}y\u001b\u0003^6;\u0007B\u001e2%\u0001SA\u007fx\u001e\u0003\u001b`q\u001cU]l&\u001aYGvpDD]l6\u0004\u0006A}0BEAop\u0004GJ~9\u0019_Dn9\u001aPP56\u0018C\\aw\u0014KKv;\u0012G\u001edr\u0003".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[93] = (new String(var10004)).intern();
+      var10003 = "\u00052(CV\u001cmr\u001c\u0001Rt7\u001cKE0(\u0015[Qk5\u0001BIb7A\u0002Dwv\u001fS\u00106r\r]Bc0\u0001UR58EDQ3x\u000ePD> A[Ks/OFJt2B^Ol E\u0006F5y\u0019\u0005@kvEKC60\rI\u0010lu\u001fDI71O\u0007".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[94] = (new String(var10004)).intern();
+      var10003 = "M?\"\u0018\b\u001f4'\u0013PZn4\u0012]\u001dm'\u0011@\u0011e'O\u0001Oc.\u001a\u0000M>.G\u0000\\3y\u0013IPc3\u001d\u0007Me4@\tBd+\u0002H\u0018f&D\u0006A4x\u0018T\u001df4B\u0006B7u\u0019^\u0019\u007f3\r\tN?/\u001d\u0000_l\"\u0014T\u001ft'\u0000V\u0019p%\u0000".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[95] = (new String(var10004)).intern();
+      var10003 = "\u0005`8\u0001]Iw7\u001c\u0001\u001ed'\u001e]M4$\u0005WR>$\u0018BMq5\u0018\u0002Ft2\u000fW^k&\u0000RZ?;NWK1;E^\u0018cx\u0013HYw9\u000eVC}+\u0010[Dd8\u001eWD\u007f#\u001fAI?yB\u0000O\u007f.FG\u001a3&\u000eSI>#\u000eBYt2\u0015_".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[96] = (new String(var10004)).intern();
+      var10003 = "\u00056x\u0010\\\u001cl*\u001cC\u0019q8\u0007W[m.GE[\u007f&\u0012\u0005G}$\u001fTN}q\u001dYFf \u0011]\u001f20\u0010CAbw\u001d\u0001@1p\u0007\b\u001fi0BFCe)\u0015\u0005\u0010dq\u0019KX6t\u001f\u0005Po-A[L1t\u000fCZnv\u001d\u0003O`tC\bJ7&\u001c\u0000".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[97] = (new String(var10004)).intern();
+      var10003 = "\ufffb\u0001".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[98] = (new String(var10004)).intern();
+      var10003 = "\u0005cp\rURr)\u001cKG1w\u0015WRo8GWZu)\u001eR@j2\u0007AM}-BKOm4\u0003\u0001Zj-\u0015E\u001cft\u000e\u0006Ghy\u000eI_7.\u001aC^\u007f\"\u001e]_?5B^Ot3\u0013FKh3\u0018ZKp \u0003P\\3;AR\u001fm'\u0002TJ0'\u0007\u0000".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[99] = (new String(var10004)).intern();
+      var10003 = "ￚￊ".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[100] = (new String(var10004)).intern();
+      var10003 = "\\￪".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[101] = (new String(var10004)).intern();
+      var10003 = "\u0005e6\u001a^B\u007f3\u0011\u0001\u001at%\u0014EZbu\u001c\u0000\u0010cy\u0016RQdw\u001c\u0007Q1/\u001b\u0005P02\rANc-\u0011^Jnq\u0004X^1t\u0010KAn$B\u0000\u001db+\u0012CR}1BPK42\u0011\u0002\u0018h7\u0002\u0003@o.ABQwr\u0006ZC7&\u0002Z\u001f\u007f2\u0004V".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[102] = (new String(var10004)).intern();
+      var10003 = "\u0019m&\u0001\u0006\u001bd0CZEs+\u0010\u0007P7*\u0005\u0004^atD]D1v\u0003\\^3p\u0010\u0004Ma9\u0011AAo;\u0019S\u001bo)\u0012I\\i7\u000eIYw1\u0016AEr*\u0001\tOv&GAJk.AAXcq\u000fT\u001fe(\u0018\u0006Xj9\u001eIK`4\u0001AOf&\u0000".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[103] = (new String(var10004)).intern();
+      var10003 = "ﾧ\"".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[104] = (new String(var10004)).intern();
+      var10003 = "K`7\rEDo%\u000f^D`;\u0000\u0006]ku\u0005YJk#GB\u001cf/\u0015COe+EKMr.BY_~4\u0011\u0001\\m.\u001e\u0001K\u007f'\u0018S\u001b~7\u0012KIit\u0011G\\br\u0015_B6*\u001aDKj+\u001eG_w1\u0012\u0005\u001ao-\u0016FE\u007f\"\u0004[Ir,\u0001".toCharArray();
+      var10005 = var10003.length;
+      var10004 = var10003;
+      var12 = var10005;
+
+      for(var2 = 0; var12 > var2; ++var2) {
+         var10007 = var10004[var2];
+         switch(var2 % 5) {
+         case 0:
+            var10008 = 40;
+            break;
+         case 1:
+            var10008 = 7;
+            break;
+         case 2:
+            var10008 = 65;
+            break;
+         case 3:
+            var10008 = 119;
+            break;
+         default:
+            var10008 = 49;
+         }
+
+         var10004[var2] = (char)(var10007 ^ var10008);
+      }
+
+      var10000[105] = (new String(var10004)).intern();
+      i = var10000;
+      char[] var6 = "{O\u0000Z\u0004\u00195".toCharArray();
+      int var10002 = var6.length;
+      char[] var10001 = var6;
+      int var7 = var10002;
+
+      char var15;
+      byte var16;
+      for(var2 = 0; var7 > var2; ++var2) {
+         var15 = var10001[var2];
+         switch(var2 % 5) {
+         case 0:
+            var16 = 40;
+            break;
+         case 1:
+            var16 = 7;
+            break;
+         case 2:
+            var16 = 65;
+            break;
+         case 3:
+            var16 = 119;
+            break;
+         default:
+            var16 = 49;
+         }
+
+         var10001[var2] = (char)(var15 ^ var16);
+      }
+
+      a = (new String(var10001)).intern();
+      var6 = "}S\u0007Z\t".toCharArray();
+      var10002 = var6.length;
+      var10001 = var6;
+      var7 = var10002;
+
+      for(var2 = 0; var7 > var2; ++var2) {
+         var15 = var10001[var2];
+         switch(var2 % 5) {
+         case 0:
+            var16 = 40;
+            break;
+         case 1:
+            var16 = 7;
+            break;
+         case 2:
+            var16 = 65;
+            break;
+         case 3:
+            var16 = 119;
+            break;
+         default:
+            var16 = 49;
+         }
+
+         var10001[var2] = (char)(var15 ^ var16);
+      }
+
+      j = (new String(var10001)).intern();
+      f = "\b";
+
+      label2227: {
+         String var10;
+         boolean var11;
+         try {
+            var10 = "Bf7\u0016\u001f[b\"\u0002CAs8Y|Mt2\u0016VMC(\u0010T[s";
+         } catch (Exception var5) {
+            var11 = false;
+            break label2227;
+         }
+
+         var6 = var10.toCharArray();
+         var10002 = var6.length;
+         var10001 = var6;
+         var7 = var10002;
+
+         for(var2 = 0; var7 > var2; ++var2) {
+            var15 = var10001[var2];
+            switch(var2 % 5) {
+            case 0:
+               var16 = 40;
+               break;
+            case 1:
+               var16 = 7;
+               break;
+            case 2:
+               var16 = 65;
+               break;
+            case 3:
+               var16 = 119;
+               break;
+            default:
+               var16 = 49;
+            }
+
+            var10001[var2] = (char)(var15 ^ var16);
+         }
+
+         var10 = (new String(var10001)).intern();
+
+         try {
+            Class.forName(var10);
+            var10 = "Bf7\u0016\u001fEf5\u001f\u001fjn&>_\\b&\u0012C";
+         } catch (Exception var4) {
+            var11 = false;
+            break label2227;
+         }
+
+         var6 = var10.toCharArray();
+         var10002 = var6.length;
+         var10001 = var6;
+         var7 = var10002;
+
+         for(var2 = 0; var7 > var2; ++var2) {
+            var15 = var10001[var2];
+            switch(var2 % 5) {
+            case 0:
+               var16 = 40;
+               break;
+            case 1:
+               var16 = 7;
+               break;
+            case 2:
+               var16 = 65;
+               break;
+            case 3:
+               var16 = 119;
+               break;
+            default:
+               var16 = 49;
+            }
+
+            var10001[var2] = (char)(var15 ^ var16);
+         }
+
+         var10 = (new String(var10001)).intern();
+
+         try {
+            Class.forName(var10);
+            "".getBytes(j);
+            b = MessageDigest.getInstance(a);
+            c = new Hashtable();
+            d = new Hashtable();
+            d.put(Byte.TYPE, "B");
+            d.put(Boolean.TYPE, "Z");
+            d.put(Short.TYPE, "S");
+            d.put(Character.TYPE, "C");
+            d.put(Integer.TYPE, "I");
+            d.put(Long.TYPE, "J");
+            d.put(Float.TYPE, "F");
+            d.put(Double.TYPE, "D");
+            g = new Hashtable();
+            h = new Hashtable();
+            a(c, b);
+            b(c, b);
+            c(c, b);
+            d(c, b);
+            e(c, b);
+            f(c, b);
+            g(c, b);
+            h(c, b);
+            i(c, b);
+            j(c, b);
+            return;
+         } catch (Exception var3) {
+            var11 = false;
+         }
+      }
+
+   }
+}
diff --git a/testData/obfuscated/c.java b/testData/obfuscated/c.java
new file mode 100644
index 0000000..079952b
--- /dev/null
+++ b/testData/obfuscated/c.java
@@ -0,0 +1,8 @@
+@aa(
+   a = {ac.class}
+)
+public class c implements ac {
+   public void a() throws Exception {
+      d.b();
+   }
+}
diff --git a/testData/obfuscated/d.java b/testData/obfuscated/d.java
new file mode 100644
index 0000000..cbe2293
--- /dev/null
+++ b/testData/obfuscated/d.java
@@ -0,0 +1,39 @@
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+public class d {
+   private static List<a<?, ?>> a = new ArrayList();
+   public static boolean b;
+
+   public static List<a<?, ?>> a() {
+      return a;
+   }
+
+   public static <K, V> a<K, V> a(String var0, int var1, f<K, V> var2, long var3, TimeUnit var5, g<V> var6, long var7, TimeUnit var9) {
+      e var10 = new e(var0, var1, TimeUnit.MILLISECONDS.convert(var3, var5), var2, var6, TimeUnit.MILLISECONDS.convert(var7, var9));
+      a.add(var10);
+      return var10;
+   }
+
+   public static <K, V> a<K, V> a(String var0, int var1, long var2, TimeUnit var4) {
+      e var5 = new e(var0, var1, TimeUnit.MILLISECONDS.convert(var2, var4), (f)null, (g)null, 10000L);
+      a.add(var5);
+      return var5;
+   }
+
+   public static void b() {
+      boolean var2 = b;
+      Iterator var0 = a().iterator();
+
+      while(var0.hasNext()) {
+         a var1 = (a)var0.next();
+         var1.i();
+         if (var2) {
+            break;
+         }
+      }
+
+   }
+}
diff --git a/testData/obfuscated/e.java b/testData/obfuscated/e.java
new file mode 100644
index 0000000..c20089e
--- /dev/null
+++ b/testData/obfuscated/e.java
@@ -0,0 +1,148 @@
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.collections.map.LRUMap;
+
+class e<K, V> implements a<K, V> {
+   private static final int a = 25;
+   protected int b;
+   protected f<K, V> c;
+   protected Map<K, b<K, V>> d;
+   protected ah e = new ah();
+   protected ah f = new ah();
+   protected List<Long> g = new ArrayList(25);
+   protected List<Long> h = new ArrayList(25);
+   protected Date i = null;
+   protected final String j;
+   protected final long k;
+   protected final g<V> l;
+   private final long m;
+
+   public e(String var1, int var2, long var3, f<K, V> var5, g<V> var6, long var7) {
+      this.j = var1;
+      this.b = var2;
+      this.m = var7;
+      if (var2 > 0) {
+         this.d = Collections.synchronizedMap(new LRUMap(var2));
+      } else {
+         this.d = Collections.synchronizedMap(new HashMap(var2));
+      }
+
+      this.k = var3;
+      this.c = var5;
+      this.l = var6;
+   }
+
+   public String a() {
+      return this.j;
+   }
+
+   public int b() {
+      return this.b;
+   }
+
+   public int c() {
+      return this.d.size();
+   }
+
+   public long d() {
+      return this.e.b() + this.f.b();
+   }
+
+   public Long f() {
+      long var1 = this.e.b();
+      long var3 = this.f.b();
+
+      long var10000;
+      try {
+         if (var1 + var3 == 0L) {
+            var10000 = 0L;
+            return var10000;
+         }
+      } catch (a_ var5) {
+         throw var5;
+      }
+
+      var10000 = Math.round(100.0D * (double)var1 / (double)(var1 + var3));
+      return var10000;
+   }
+
+   public Date h() {
+      return this.i;
+   }
+
+   public void i() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public void j() {
+      this.d.clear();
+      this.f.c();
+      this.e.c();
+      this.i = new Date();
+   }
+
+   public V a(K var1) {
+      return this.a(var1, this.c);
+   }
+
+   public boolean c(K var1) {
+      return this.d.containsKey(var1);
+   }
+
+   public V a(K param1, f<K, V> param2) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public void a(K var1, V var2) {
+      b var10000;
+      b var10001;
+      Object var10002;
+      Object var10003;
+      long var10004;
+      label16: {
+         try {
+            var10000 = new b;
+            var10001 = var10000;
+            var10002 = var1;
+            var10003 = var2;
+            if (this.k > 0L) {
+               var10004 = this.k + System.currentTimeMillis();
+               break label16;
+            }
+         } catch (a_ var4) {
+            throw var4;
+         }
+
+         var10004 = 0L;
+      }
+
+      var10001.<init>(var10002, var10003, var10004, this.m + System.currentTimeMillis());
+      b var3 = var10000;
+      this.d.put(var1, var3);
+   }
+
+   public void b(K var1) {
+      this.d.remove(var1);
+   }
+
+   public Iterator<K> k() {
+      return this.d.keySet().iterator();
+   }
+
+   public List<b<K, V>> l() {
+      return new ArrayList(this.d.values());
+   }
+
+   public List<Long> e() {
+      return this.g;
+   }
+
+   public List<Long> g() {
+      return this.h;
+   }
+}
diff --git a/testData/obfuscated/f.java b/testData/obfuscated/f.java
new file mode 100644
index 0000000..d015aad
--- /dev/null
+++ b/testData/obfuscated/f.java
@@ -0,0 +1,3 @@
+public interface f<K, V> {
+   V a(K var1);
+}
diff --git a/testData/obfuscated/g.java b/testData/obfuscated/g.java
new file mode 100644
index 0000000..a8879e2
--- /dev/null
+++ b/testData/obfuscated/g.java
@@ -0,0 +1,3 @@
+public interface g<V> {
+   boolean a(V var1);
+}
diff --git a/testData/obfuscated/h.java b/testData/obfuscated/h.java
new file mode 100644
index 0000000..aa4d38d
--- /dev/null
+++ b/testData/obfuscated/h.java
@@ -0,0 +1,50 @@
+import java.util.concurrent.atomic.AtomicLong;
+
+public class h {
+   private final AtomicLong a = new AtomicLong();
+
+   public long a() {
+      boolean var5 = n.c;
+      long var1 = this.a.incrementAndGet();
+
+      long var10000;
+      label48: {
+         try {
+            var10000 = var1;
+            if (var5) {
+               return var10000;
+            }
+
+            if (var1 <= 9223372036854775797L) {
+               break label48;
+            }
+         } catch (a_ var8) {
+            throw var8;
+         }
+
+         AtomicLong var3;
+         synchronized(var3 = this.a) {
+            AtomicLong var9 = this.a;
+            if (!var5) {
+               try {
+                  if (var9.get() > 9223372036854775797L) {
+                     this.a.set(0L);
+                  }
+               } catch (a_ var6) {
+                  throw var6;
+               }
+
+               var9 = var3;
+            }
+
+         }
+      }
+
+      var10000 = var1;
+      return var10000;
+   }
+
+   public String b() {
+      return String.valueOf(this.a());
+   }
+}
diff --git a/testData/obfuscated/i.java b/testData/obfuscated/i.java
new file mode 100644
index 0000000..693bafb
--- /dev/null
+++ b/testData/obfuscated/i.java
@@ -0,0 +1,18 @@
+import java.util.Collection;
+import java.util.Iterator;
+
+public abstract class i<T> implements k<T> {
+   public void a(Collection<? extends T> var1) {
+      boolean var4 = n.c;
+      Iterator var2 = var1.iterator();
+
+      while(var2.hasNext()) {
+         Object var3 = var2.next();
+         this.a(var3);
+         if (var4) {
+            break;
+         }
+      }
+
+   }
+}
diff --git a/testData/obfuscated/j.java b/testData/obfuscated/j.java
new file mode 100644
index 0000000..d29f986
--- /dev/null
+++ b/testData/obfuscated/j.java
@@ -0,0 +1,36 @@
+class j extends i<ak> {
+   final ai a;
+
+   j(ai var1) {
+      this.a = var1;
+   }
+
+   public void a(ak var1) {
+      al var2 = (al)ai.b().get(var1);
+
+      al var10000;
+      label21: {
+         label20: {
+            try {
+               var10000 = var2;
+               if (an.k) {
+                  break label21;
+               }
+
+               if (var2 != null) {
+                  break label20;
+               }
+            } catch (a_ var3) {
+               throw var3;
+            }
+
+            var2 = new al(var1);
+            ai.b().put(var1, var2);
+         }
+
+         var10000 = var2;
+      }
+
+      var10000.a(var1.d());
+   }
+}
diff --git a/testData/obfuscated/k.java b/testData/obfuscated/k.java
new file mode 100644
index 0000000..5f16ecf
--- /dev/null
+++ b/testData/obfuscated/k.java
@@ -0,0 +1,7 @@
+import java.util.Collection;
+
+public interface k<T> {
+   void a(T var1);
+
+   void a(Collection<? extends T> var1);
+}
diff --git a/testData/obfuscated/l.java b/testData/obfuscated/l.java
new file mode 100644
index 0000000..7f393c9
--- /dev/null
+++ b/testData/obfuscated/l.java
@@ -0,0 +1,19 @@
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+public class l<T> implements k<T> {
+   private List<T> a = new ArrayList();
+
+   public void a(T var1) {
+      this.a.add(var1);
+   }
+
+   public void a(Collection<? extends T> var1) {
+      this.a.addAll(var1);
+   }
+
+   public List<T> a() {
+      return this.a;
+   }
+}
diff --git a/testData/obfuscated/m.java b/testData/obfuscated/m.java
new file mode 100644
index 0000000..af43311
--- /dev/null
+++ b/testData/obfuscated/m.java
@@ -0,0 +1,19 @@
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+public class m<T> implements k<T> {
+   private Set<T> a = new LinkedHashSet();
+
+   public void a(T var1) {
+      this.a.add(var1);
+   }
+
+   public void a(Collection<? extends T> var1) {
+      this.a.addAll(var1);
+   }
+
+   public Set<T> a() {
+      return this.a;
+   }
+}
diff --git a/testData/obfuscated/n.java b/testData/obfuscated/n.java
new file mode 100644
index 0000000..721543c
--- /dev/null
+++ b/testData/obfuscated/n.java
@@ -0,0 +1,209 @@
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+public class n<F, S> {
+   private F a;
+   private S b;
+   public static boolean c;
+   private static final String d;
+
+   public n() {
+   }
+
+   public n(F var1) {
+      this.a = var1;
+   }
+
+   public n(F var1, S var2) {
+      this.a = var1;
+      this.b = var2;
+   }
+
+   public F a() {
+      return this.a;
+   }
+
+   public void a(F var1) {
+      this.a = var1;
+   }
+
+   public S b() {
+      return this.b;
+   }
+
+   public void b(S var1) {
+      this.b = var1;
+   }
+
+   public boolean equals(Object param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   private boolean a(Object param1, Object param2) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public String toString() {
+      return this.a + d + this.b;
+   }
+
+   public int hashCode() {
+      Object var10000;
+      label28: {
+         try {
+            if (this.a == null) {
+               var10000 = "";
+               break label28;
+            }
+         } catch (a_ var2) {
+            throw var2;
+         }
+
+         var10000 = this.a;
+      }
+
+      Object var10001;
+      int var3;
+      try {
+         var3 = var10000.hashCode() / 2;
+         if (this.b == null) {
+            var10001 = "";
+            return var3 + var10001.hashCode() / 2;
+         }
+      } catch (a_ var1) {
+         throw var1;
+      }
+
+      var10001 = this.b;
+      return var3 + var10001.hashCode() / 2;
+   }
+
+   public static <T extends n<K, V>, K, V> List<K> a(Collection<T> var0) {
+      ArrayList var1 = new ArrayList(var0.size());
+      Iterator var2 = var0.iterator();
+
+      while(var2.hasNext()) {
+         n var3 = (n)var2.next();
+         var1.add(var3.a());
+      }
+
+      return var1;
+   }
+
+   public static <T extends n<K, V>, K, V> List<V> b(Collection<T> param0) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public static <K, V> List<n<K, V>> a(Map<K, V> var0) {
+      boolean var4 = c;
+      ArrayList var1 = new ArrayList(var0.size());
+      Iterator var2 = var0.entrySet().iterator();
+
+      ArrayList var10000;
+      while(true) {
+         if (var2.hasNext()) {
+            Entry var3 = (Entry)var2.next();
+
+            try {
+               var10000 = var1;
+               if (var4) {
+                  break;
+               }
+
+               var1.add(new n(var3.getKey(), var3.getValue()));
+               if (!var4) {
+                  continue;
+               }
+            } catch (a_ var6) {
+               throw var6;
+            }
+
+            int var5 = ap.c;
+            ++var5;
+            ap.c = var5;
+         }
+
+         var10000 = var1;
+         break;
+      }
+
+      return var10000;
+   }
+
+   public static <K, V> Map<K, V> c(Collection<n<K, V>> var0) {
+      HashMap var1 = new HashMap();
+      Iterator var2 = var0.iterator();
+
+      while(var2.hasNext()) {
+         n var3 = (n)var2.next();
+         var1.put(var3.a(), var3.b());
+      }
+
+      return var1;
+   }
+
+   static {
+      char[] var10000 = "p\u001c".toCharArray();
+      int var10002 = var10000.length;
+      int var1 = 0;
+      char[] var10001 = var10000;
+      int var2 = var10002;
+      int var10003;
+      char[] var4;
+      if (var10002 <= 1) {
+         var4 = var10000;
+         var10003 = var1;
+      } else {
+         var10001 = var10000;
+         var2 = var10002;
+         if (var10002 <= var1) {
+            d = (new String(var10000)).intern();
+            return;
+         }
+
+         var4 = var10000;
+         var10003 = var1;
+      }
+
+      while(true) {
+         char var10004 = var4[var10003];
+         byte var10005;
+         switch(var1 % 5) {
+         case 0:
+            var10005 = 74;
+            break;
+         case 1:
+            var10005 = 60;
+            break;
+         case 2:
+            var10005 = 116;
+            break;
+         case 3:
+            var10005 = 28;
+            break;
+         default:
+            var10005 = 38;
+         }
+
+         var4[var10003] = (char)(var10004 ^ var10005);
+         ++var1;
+         if (var2 == 0) {
+            var10003 = var2;
+            var4 = var10001;
+         } else {
+            if (var2 <= var1) {
+               d = (new String(var10001)).intern();
+               return;
+            }
+
+            var4 = var10001;
+            var10003 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/o.java b/testData/obfuscated/o.java
new file mode 100644
index 0000000..8e00c49
--- /dev/null
+++ b/testData/obfuscated/o.java
@@ -0,0 +1,461 @@
+import java.math.BigDecimal;
+import java.util.regex.Pattern;
+
+public class o {
+   private Object a;
+   private static final Pattern b;
+   private static final String c;
+
+   public boolean a() {
+      boolean var10000;
+      try {
+         if (this.a == null) {
+            var10000 = true;
+            return var10000;
+         }
+      } catch (IllegalArgumentException var1) {
+         throw var1;
+      }
+
+      var10000 = false;
+      return var10000;
+   }
+
+   public boolean b() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public boolean c() {
+      boolean var10000;
+      try {
+         if (!this.b()) {
+            var10000 = true;
+            return var10000;
+         }
+      } catch (IllegalArgumentException var1) {
+         throw var1;
+      }
+
+      var10000 = false;
+      return var10000;
+   }
+
+   public o a(String... var1) {
+      try {
+         if (this.b()) {
+            return this;
+         }
+      } catch (IllegalArgumentException var7) {
+         throw var7;
+      }
+
+      String[] var2 = var1;
+      int var3 = var1.length;
+
+      for(int var4 = 0; var4 < var3; ++var4) {
+         String var5 = var2[var4];
+
+         try {
+            if (this.a.equals(var5)) {
+               return b((Object)null);
+            }
+         } catch (IllegalArgumentException var6) {
+            throw var6;
+         }
+      }
+
+      return this;
+   }
+
+   public boolean d() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public Object e() {
+      return this.a;
+   }
+
+   public Object a(Object var1) {
+      Object var10000;
+      try {
+         if (this.a == null) {
+            var10000 = var1;
+            return var10000;
+         }
+      } catch (IllegalArgumentException var2) {
+         throw var2;
+      }
+
+      var10000 = this.a;
+      return var10000;
+   }
+
+   public <T> T a(Class<?> param1, T param2) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public <V> V b(Class<V> param1, V param2) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public String f() {
+      String var10000;
+      try {
+         if (this.a()) {
+            var10000 = null;
+            return var10000;
+         }
+      } catch (IllegalArgumentException var1) {
+         throw var1;
+      }
+
+      var10000 = this.g();
+      return var10000;
+   }
+
+   public String g() {
+      String var10000;
+      try {
+         if (this.a == null) {
+            var10000 = "";
+            return var10000;
+         }
+      } catch (IllegalArgumentException var1) {
+         throw var1;
+      }
+
+      var10000 = this.a.toString();
+      return var10000;
+   }
+
+   public String a(String var1) {
+      String var10000;
+      try {
+         if (this.a()) {
+            var10000 = var1;
+            return var10000;
+         }
+      } catch (IllegalArgumentException var2) {
+         throw var2;
+      }
+
+      var10000 = this.g();
+      return var10000;
+   }
+
+   public boolean a(boolean var1) {
+      try {
+         if (this.a()) {
+            return var1;
+         }
+      } catch (IllegalArgumentException var2) {
+         throw var2;
+      }
+
+      try {
+         if (this.a instanceof Boolean) {
+            return (Boolean)this.a;
+         }
+      } catch (IllegalArgumentException var3) {
+         throw var3;
+      }
+
+      return Boolean.parseBoolean(String.valueOf(this.a));
+   }
+
+   public boolean h() {
+      return this.a(false);
+   }
+
+   public int a(int param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public Integer i() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public long a(long param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public Long j() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public double a(double param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public BigDecimal a(BigDecimal param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public static o b(Object var0) {
+      o var1 = new o();
+      var1.a = var0;
+      return var1;
+   }
+
+   public String toString() {
+      return this.g();
+   }
+
+   public <E extends Enum<E>> E a(Class<E> var1) {
+      try {
+         if (this.a == null) {
+            return null;
+         }
+      } catch (Exception var4) {
+         throw var4;
+      }
+
+      try {
+         if (var1.isAssignableFrom(this.a.getClass())) {
+            return (Enum)this.a;
+         }
+      } catch (Exception var5) {
+         throw var5;
+      }
+
+      try {
+         return Enum.valueOf(var1, String.valueOf(this.a));
+      } catch (Exception var3) {
+         return null;
+      }
+   }
+
+   public String b(int var1) {
+      String var2 = this.g();
+
+      try {
+         if (var2 == null) {
+            return null;
+         }
+      } catch (IllegalArgumentException var3) {
+         throw var3;
+      }
+
+      if (var1 < 0) {
+         var1 *= -1;
+
+         try {
+            if (var2.length() < var1) {
+               return "";
+            }
+         } catch (IllegalArgumentException var4) {
+            throw var4;
+         }
+
+         return var2.substring(var1);
+      } else {
+         try {
+            if (var2.length() < var1) {
+               return var2;
+            }
+         } catch (IllegalArgumentException var5) {
+            throw var5;
+         }
+
+         return var2.substring(0, var1);
+      }
+   }
+
+   public String c(int var1) {
+      String var2 = this.g();
+
+      try {
+         if (var2 == null) {
+            return null;
+         }
+      } catch (IllegalArgumentException var3) {
+         throw var3;
+      }
+
+      if (var1 < 0) {
+         var1 *= -1;
+
+         try {
+            if (var2.length() < var1) {
+               return var2;
+            }
+         } catch (IllegalArgumentException var4) {
+            throw var4;
+         }
+
+         return var2.substring(0, var2.length() - var1);
+      } else {
+         try {
+            if (var2.length() < var1) {
+               return var2;
+            }
+         } catch (IllegalArgumentException var5) {
+            throw var5;
+         }
+
+         return var2.substring(var2.length() - var1);
+      }
+   }
+
+   public String a(int var1, int var2) {
+      String var3 = this.g();
+
+      try {
+         if (var3 == null) {
+            return null;
+         }
+      } catch (IllegalArgumentException var4) {
+         throw var4;
+      }
+
+      try {
+         if (var1 > var3.length()) {
+            return "";
+         }
+      } catch (IllegalArgumentException var5) {
+         throw var5;
+      }
+
+      return var3.substring(var1, Math.min(var3.length(), var2));
+   }
+
+   public int k() {
+      String var1 = this.g();
+
+      try {
+         if (var1 == null) {
+            return 0;
+         }
+      } catch (IllegalArgumentException var2) {
+         throw var2;
+      }
+
+      return var1.length();
+   }
+
+   public boolean b(Class<?> param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   static {
+      char[] var10000;
+      int var1;
+      char[] var10001;
+      int var10002;
+      int var2;
+      int var10003;
+      char[] var4;
+      char var10004;
+      byte var10005;
+      label51: {
+         var10000 = "\t!\"\u0000r>`/\u0001s<%>\u001a=>/vN".toCharArray();
+         var10002 = var10000.length;
+         var1 = 0;
+         var10001 = var10000;
+         var2 = var10002;
+         if (var10002 <= 1) {
+            var4 = var10000;
+            var10003 = var1;
+         } else {
+            var10001 = var10000;
+            var2 = var10002;
+            if (var10002 <= var1) {
+               break label51;
+            }
+
+            var4 = var10000;
+            var10003 = var1;
+         }
+
+         while(true) {
+            var10004 = var4[var10003];
+            switch(var1 % 5) {
+            case 0:
+               var10005 = 74;
+               break;
+            case 1:
+               var10005 = 64;
+               break;
+            case 2:
+               var10005 = 76;
+               break;
+            case 3:
+               var10005 = 110;
+               break;
+            default:
+               var10005 = 29;
+            }
+
+            var4[var10003] = (char)(var10004 ^ var10005);
+            ++var1;
+            if (var2 == 0) {
+               var10003 = var2;
+               var4 = var10001;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10001;
+               var10003 = var1;
+            }
+         }
+      }
+
+      c = (new String(var10001)).intern();
+      var10000 = "\u0016$gFAd\u001c(E4u".toCharArray();
+      var10002 = var10000.length;
+      var1 = 0;
+      var10001 = var10000;
+      var2 = var10002;
+      if (var10002 <= 1) {
+         var4 = var10000;
+         var10003 = var1;
+      } else {
+         var10001 = var10000;
+         var2 = var10002;
+         if (var10002 <= var1) {
+            b = Pattern.compile((new String(var10000)).intern());
+            return;
+         }
+
+         var4 = var10000;
+         var10003 = var1;
+      }
+
+      while(true) {
+         var10004 = var4[var10003];
+         switch(var1 % 5) {
+         case 0:
+            var10005 = 74;
+            break;
+         case 1:
+            var10005 = 64;
+            break;
+         case 2:
+            var10005 = 76;
+            break;
+         case 3:
+            var10005 = 110;
+            break;
+         default:
+            var10005 = 29;
+         }
+
+         var4[var10003] = (char)(var10004 ^ var10005);
+         ++var1;
+         if (var2 == 0) {
+            var10003 = var2;
+            var4 = var10001;
+         } else {
+            if (var2 <= var1) {
+               b = Pattern.compile((new String(var10001)).intern());
+               return;
+            }
+
+            var4 = var10001;
+            var10003 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/p.java b/testData/obfuscated/p.java
new file mode 100644
index 0000000..e588675
--- /dev/null
+++ b/testData/obfuscated/p.java
@@ -0,0 +1,1047 @@
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+
+public class p {
+   protected String a;
+   protected String b;
+   protected String c;
+   private String d;
+   private String e;
+   private Throwable f;
+   private static final String[] g;
+
+   public p(String var1, String var2, Throwable var3, String var4) {
+      int var10 = s.d;
+      super();
+      this.e = "";
+      this.a = var1;
+      this.c = var2;
+      this.f = var3;
+      ArrayList var5 = new ArrayList(Arrays.asList(Thread.currentThread().getStackTrace()));
+      int var6 = 3;
+
+      while(!var5.isEmpty()) {
+         try {
+            if (var6 <= 0) {
+               break;
+            }
+
+            var5.remove(0);
+            --var6;
+            if (var10 == 0) {
+               continue;
+            }
+         } catch (a_ var16) {
+            throw var16;
+         }
+
+         int var11 = ap.c;
+         ++var11;
+         ap.c = var11;
+         break;
+      }
+
+      StringBuilder var7 = new StringBuilder();
+      Iterator var8 = var5.iterator();
+
+      while(true) {
+         if (var8.hasNext()) {
+            StackTraceElement var9 = (StackTraceElement)var8.next();
+
+            try {
+               var7.append(var9.getClassName());
+               var7.append(".");
+               var7.append(var9.getMethodName());
+               var7.append(g[0]);
+               var7.append(var9.getFileName());
+               var7.append(":");
+               var7.append(var9.getLineNumber());
+               var7.append(")");
+               var7.append("\n");
+               if (var10 != 0) {
+                  break;
+               }
+
+               if (var10 == 0) {
+                  continue;
+               }
+            } catch (a_ var15) {
+               throw var15;
+            }
+         }
+
+         this.d = var7.toString();
+         break;
+      }
+
+      p var10000;
+      String var10001;
+      label56: {
+         label55: {
+            label54: {
+               try {
+                  if (var10 != 0) {
+                     break label55;
+                  }
+
+                  if (var3 == null) {
+                     break label54;
+                  }
+               } catch (a_ var14) {
+                  throw var14;
+               }
+
+               StringWriter var17 = new StringWriter();
+               PrintWriter var18 = new PrintWriter(var17);
+               var3.printStackTrace(var18);
+               this.e = var17.toString();
+               var18.close();
+            }
+
+            try {
+               var10000 = this;
+               var10001 = var4;
+               if (var10 != 0) {
+                  break label56;
+               }
+
+               this.b = var4;
+            } catch (a_ var13) {
+               throw var13;
+            }
+         }
+
+         try {
+            if (var4 != null) {
+               return;
+            }
+
+            var10000 = this;
+            var10001 = var1;
+         } catch (a_ var12) {
+            throw var12;
+         }
+      }
+
+      var10000.b = var10001;
+   }
+
+   public String a() {
+      return this.c;
+   }
+
+   public String b() {
+      return this.d;
+   }
+
+   public String c() {
+      return this.b;
+   }
+
+   public String d() {
+      return this.e;
+   }
+
+   public String toString() {
+      StringBuilder var1 = new StringBuilder();
+      var1.append(this.e());
+      var1.append(g[4]);
+      var1.append(this.a());
+      var1.append(g[1]);
+      var1.append(g[3]);
+      var1.append(this.c());
+      var1.append(g[2]);
+      return var1.toString();
+   }
+
+   public String e() {
+      return this.a;
+   }
+
+   public Throwable f() {
+      return this.f;
+   }
+
+   static {
+      String[] var10000 = new String[5];
+      char[] var10003 = "D@".toCharArray();
+      int var10005 = var10003.length;
+      int var1 = 0;
+      char[] var10004 = var10003;
+      int var2 = var10005;
+      char[] var4;
+      int var10006;
+      char var10007;
+      byte var10008;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 100;
+            break;
+         case 1:
+            var10008 = 104;
+            break;
+         case 2:
+            var10008 = 14;
+            break;
+         case 3:
+            var10008 = 21;
+            break;
+         default:
+            var10008 = 25;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label316: {
+               var10000[0] = (new String(var10003)).intern();
+               var10003 = "nE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84Ib".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label316;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 100;
+                     break;
+                  case 1:
+                     var10008 = 104;
+                     break;
+                  case 2:
+                     var10008 = 14;
+                     break;
+                  case 3:
+                     var10008 = 21;
+                     break;
+                  default:
+                     var10008 = 25;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[1] = (new String(var10004)).intern();
+            var10003 = "nE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84Ib".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 100;
+                  break;
+               case 1:
+                  var10008 = 104;
+                  break;
+               case 2:
+                  var10008 = 14;
+                  break;
+               case 3:
+                  var10008 = 21;
+                  break;
+               default:
+                  var10008 = 25;
+               }
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  label384: {
+                     var10000[2] = (new String(var10003)).intern();
+                     var10003 = "(\u0007mtm\r\u0007`/\u0013".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label384;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 100;
+                           break;
+                        case 1:
+                           var10008 = 104;
+                           break;
+                        case 2:
+                           var10008 = 14;
+                           break;
+                        case 3:
+                           var10008 = 21;
+                           break;
+                        default:
+                           var10008 = 25;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[3] = (new String(var10004)).intern();
+                  var10003 = "Db#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE\u0004".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[4] = (new String(var10003)).intern();
+                        g = var10000;
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 100;
+                        break;
+                     case 1:
+                        var10008 = 104;
+                        break;
+                     case 2:
+                        var10008 = 14;
+                        break;
+                     case 3:
+                        var10008 = 21;
+                        break;
+                     default:
+                        var10008 = 25;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[4] = (new String(var10004)).intern();
+                           g = var10000;
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 100;
+                  break;
+               case 1:
+                  var10008 = 104;
+                  break;
+               case 2:
+                  var10008 = 14;
+                  break;
+               case 3:
+                  var10008 = 21;
+                  break;
+               default:
+                  var10008 = 25;
+               }
+            }
+
+            while(true) {
+               while(true) {
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                     var10007 = var10004[var2];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 100;
+                        break;
+                     case 1:
+                        var10008 = 104;
+                        break;
+                     case 2:
+                        var10008 = 14;
+                        break;
+                     case 3:
+                        var10008 = 21;
+                        break;
+                     default:
+                        var10008 = 25;
+                     }
+                  } else {
+                     if (var2 <= var1) {
+                        label492: {
+                           var10000[2] = (new String(var10004)).intern();
+                           var10003 = "(\u0007mtm\r\u0007`/\u0013".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label492;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 100;
+                                 break;
+                              case 1:
+                                 var10008 = 104;
+                                 break;
+                              case 2:
+                                 var10008 = 14;
+                                 break;
+                              case 3:
+                                 var10008 = 21;
+                                 break;
+                              default:
+                                 var10008 = 25;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "Db#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE\u0004".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[4] = (new String(var10003)).intern();
+                              g = var10000;
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 100;
+                              break;
+                           case 1:
+                              var10008 = 104;
+                              break;
+                           case 2:
+                              var10008 = 14;
+                              break;
+                           case 3:
+                              var10008 = 21;
+                              break;
+                           default:
+                              var10008 = 25;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 g = var10000;
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                     var10007 = var10004[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 100;
+                        break;
+                     case 1:
+                        var10008 = 104;
+                        break;
+                     case 2:
+                        var10008 = 14;
+                        break;
+                     case 3:
+                        var10008 = 21;
+                        break;
+                     default:
+                        var10008 = 25;
+                     }
+                  }
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 100;
+            break;
+         case 1:
+            var10008 = 104;
+            break;
+         case 2:
+            var10008 = 14;
+            break;
+         case 3:
+            var10008 = 21;
+            break;
+         default:
+            var10008 = 25;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 100;
+                  break;
+               case 1:
+                  var10008 = 104;
+                  break;
+               case 2:
+                  var10008 = 14;
+                  break;
+               case 3:
+                  var10008 = 21;
+                  break;
+               default:
+                  var10008 = 25;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label129: {
+                     var10000[0] = (new String(var10004)).intern();
+                     var10003 = "nE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84Ib".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label129;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 100;
+                           break;
+                        case 1:
+                           var10008 = 104;
+                           break;
+                        case 2:
+                           var10008 = 14;
+                           break;
+                        case 3:
+                           var10008 = 21;
+                           break;
+                        default:
+                           var10008 = 25;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[1] = (new String(var10004)).intern();
+                  var10003 = "nE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84Ib".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 100;
+                        break;
+                     case 1:
+                        var10008 = 104;
+                        break;
+                     case 2:
+                        var10008 = 14;
+                        break;
+                     case 3:
+                        var10008 = 21;
+                        break;
+                     default:
+                        var10008 = 25;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        label173: {
+                           var10000[2] = (new String(var10003)).intern();
+                           var10003 = "(\u0007mtm\r\u0007`/\u0013".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label173;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 100;
+                                 break;
+                              case 1:
+                                 var10008 = 104;
+                                 break;
+                              case 2:
+                                 var10008 = 14;
+                                 break;
+                              case 3:
+                                 var10008 = 21;
+                                 break;
+                              default:
+                                 var10008 = 25;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "Db#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE\u0004".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[4] = (new String(var10003)).intern();
+                              g = var10000;
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 100;
+                              break;
+                           case 1:
+                              var10008 = 104;
+                              break;
+                           case 2:
+                              var10008 = 14;
+                              break;
+                           case 3:
+                              var10008 = 21;
+                              break;
+                           default:
+                              var10008 = 25;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 g = var10000;
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 100;
+                        break;
+                     case 1:
+                        var10008 = 104;
+                        break;
+                     case 2:
+                        var10008 = 14;
+                        break;
+                     case 3:
+                        var10008 = 21;
+                        break;
+                     default:
+                        var10008 = 25;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                           var10007 = var10004[var2];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 100;
+                              break;
+                           case 1:
+                              var10008 = 104;
+                              break;
+                           case 2:
+                              var10008 = 14;
+                              break;
+                           case 3:
+                              var10008 = 21;
+                              break;
+                           default:
+                              var10008 = 25;
+                           }
+                        } else {
+                           if (var2 <= var1) {
+                              label93: {
+                                 var10000[2] = (new String(var10004)).intern();
+                                 var10003 = "(\u0007mtm\r\u0007`/\u0013".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= 1) {
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var2 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label93;
+                                    }
+
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var4[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 100;
+                                       break;
+                                    case 1:
+                                       var10008 = 104;
+                                       break;
+                                    case 2:
+                                       var10008 = 14;
+                                       break;
+                                    case 3:
+                                       var10008 = 21;
+                                       break;
+                                    default:
+                                       var10008 = 25;
+                                    }
+
+                                    var4[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var2 == 0) {
+                                       var10006 = var2;
+                                       var4 = var10004;
+                                    } else {
+                                       if (var2 <= var1) {
+                                          break;
+                                       }
+
+                                       var4 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[3] = (new String(var10004)).intern();
+                              var10003 = "Db#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE#84IE\u0004".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= 1) {
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              } else {
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= var1) {
+                                    var10000[4] = (new String(var10003)).intern();
+                                    g = var10000;
+                                    return;
+                                 }
+
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              }
+
+                              while(true) {
+                                 var10007 = var4[var10006];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 100;
+                                    break;
+                                 case 1:
+                                    var10008 = 104;
+                                    break;
+                                 case 2:
+                                    var10008 = 14;
+                                    break;
+                                 case 3:
+                                    var10008 = 21;
+                                    break;
+                                 default:
+                                    var10008 = 25;
+                                 }
+
+                                 var4[var10006] = (char)(var10007 ^ var10008);
+                                 ++var1;
+                                 if (var2 == 0) {
+                                    var10006 = var2;
+                                    var4 = var10004;
+                                 } else {
+                                    if (var2 <= var1) {
+                                       var10000[4] = (new String(var10004)).intern();
+                                       g = var10000;
+                                       return;
+                                    }
+
+                                    var4 = var10004;
+                                    var10006 = var1;
+                                 }
+                              }
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 100;
+                              break;
+                           case 1:
+                              var10008 = 104;
+                              break;
+                           case 2:
+                              var10008 = 14;
+                              break;
+                           case 3:
+                              var10008 = 21;
+                              break;
+                           default:
+                              var10008 = 25;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 100;
+                  break;
+               case 1:
+                  var10008 = 104;
+                  break;
+               case 2:
+                  var10008 = 14;
+                  break;
+               case 3:
+                  var10008 = 21;
+                  break;
+               default:
+                  var10008 = 25;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/q.java b/testData/obfuscated/q.java
new file mode 100644
index 0000000..2d00496
--- /dev/null
+++ b/testData/obfuscated/q.java
@@ -0,0 +1,3 @@
+public interface q {
+   void a(p var1);
+}
diff --git a/testData/obfuscated/r.java b/testData/obfuscated/r.java
new file mode 100644
index 0000000..173e7e3
--- /dev/null
+++ b/testData/obfuscated/r.java
@@ -0,0 +1,172 @@
+import java.sql.SQLException;
+import java.util.List;
+import java.util.logging.Logger;
+
+public class r {
+   public static final Logger a;
+   @x(
+      a = q.class
+   )
+   private static List<q> b;
+   private static final String[] c;
+
+   public static s a(String var0) {
+      return new s(var0);
+   }
+
+   private static a9 a(p param0) {
+      // $FF: Couldn't be decompiled
+   }
+
+   public static a9 a(Throwable var0) {
+      try {
+         if (var0 instanceof a9) {
+            return (a9)var0;
+         }
+      } catch (a9 var1) {
+         throw var1;
+      }
+
+      try {
+         if (var0 instanceof SQLException) {
+            return a(c[0]).a(var0).a();
+         }
+      } catch (a9 var2) {
+         throw var2;
+      }
+
+      return a(c[1]).a(var0).a();
+   }
+
+   static a9 b(p var0) {
+      return a(var0);
+   }
+
+   static {
+      String[] var10000;
+      int var1;
+      int var2;
+      char[] var10003;
+      char[] var10004;
+      char[] var4;
+      int var10005;
+      int var10006;
+      char var10007;
+      byte var10008;
+      label51: {
+         var10000 = new String[2];
+         var10003 = "hzE\u0016\u0001nt\u0002\u0007\u000bi|\u000275W\\T\u0007\u0001kmE\u000b\n".toCharArray();
+         var10005 = var10003.length;
+         var1 = 0;
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= 1) {
+            var4 = var10003;
+            var10006 = var1;
+         } else {
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= var1) {
+               break label51;
+            }
+
+            var4 = var10003;
+            var10006 = var1;
+         }
+
+         while(true) {
+            var10007 = var4[var10006];
+            switch(var1 % 5) {
+            case 0:
+               var10008 = 27;
+               break;
+            case 1:
+               var10008 = 25;
+               break;
+            case 2:
+               var10008 = 44;
+               break;
+            case 3:
+               var10008 = 100;
+               break;
+            default:
+               var10008 = 100;
+            }
+
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+            } else {
+               if (var2 <= var1) {
+                  break;
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+            }
+         }
+      }
+
+      var10000[0] = (new String(var10004)).intern();
+      var10003 = "hzE\u0016\u0001nt\u0002\u0007\u000bi|\u00021\n~a\\\u0001\u0007o|H!\u001cx|\\\u0010\rtw".toCharArray();
+      var10005 = var10003.length;
+      var1 = 0;
+      var10004 = var10003;
+      var2 = var10005;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            var10000[1] = (new String(var10003)).intern();
+            c = var10000;
+            a = Logger.getLogger(r.class.getName());
+            return;
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+      }
+
+      while(true) {
+         var10007 = var4[var10006];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 27;
+            break;
+         case 1:
+            var10008 = 25;
+            break;
+         case 2:
+            var10008 = 44;
+            break;
+         case 3:
+            var10008 = 100;
+            break;
+         default:
+            var10008 = 100;
+         }
+
+         var4[var10006] = (char)(var10007 ^ var10008);
+         ++var1;
+         if (var2 == 0) {
+            var10006 = var2;
+            var4 = var10004;
+         } else {
+            if (var2 <= var1) {
+               var10000[1] = (new String(var10004)).intern();
+               c = var10000;
+               a = Logger.getLogger(r.class.getName());
+               return;
+            }
+
+            var4 = var10004;
+            var10006 = var1;
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/s.java b/testData/obfuscated/s.java
new file mode 100644
index 0000000..bc0b96e
--- /dev/null
+++ b/testData/obfuscated/s.java
@@ -0,0 +1,937 @@
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class s {
+   private final String a;
+   private Map<String, String> b = new LinkedHashMap();
+   private Throwable c;
+   public static int d;
+   private static final String[] e;
+
+   public s(String var1) {
+      this.a = var1;
+   }
+
+   public s a(Throwable var1) {
+      this.c = var1;
+      return this;
+   }
+
+   public s a(String var1, Object var2) {
+      try {
+         if (var2 != null) {
+            this.b.put(var1, var2.toString());
+         }
+
+         return this;
+      } catch (a_ var3) {
+         throw var3;
+      }
+   }
+
+   public a9 a() {
+      return r.b(this.b());
+   }
+
+   protected p b() {
+      // $FF: Couldn't be decompiled
+   }
+
+   protected static String b(Throwable var0) {
+      String var1 = "-";
+      StackTraceElement[] var2;
+      if (var0 != null) {
+         var2 = var0.getStackTrace();
+         if (var2.length > 0) {
+            var1 = var2[0].getFileName() + ":" + var2[0].getLineNumber() + "[" + var2[0].getClassName() + "." + var2[0].getMethodName() + "]";
+         }
+      } else {
+         var2 = Thread.currentThread().getStackTrace();
+         if (var2.length > 5) {
+            var1 = var2[5].getFileName() + ":" + var2[5].getLineNumber() + "[" + var2[5].getClassName() + "." + var2[5].getMethodName() + "]";
+         }
+      }
+
+      return var1;
+   }
+
+   static {
+      String[] var10000 = new String[5];
+      char[] var10003 = "][BX\u0014\u0014\u000bsI\u0018\u001fA'".toCharArray();
+      int var10005 = var10003.length;
+      int var1 = 0;
+      char[] var10004 = var10003;
+      int var2 = var10005;
+      char[] var4;
+      int var10006;
+      char var10007;
+      byte var10008;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 113;
+            break;
+         case 1:
+            var10008 = 123;
+            break;
+         case 2:
+            var10008 = 7;
+            break;
+         case 3:
+            var10008 = 32;
+            break;
+         default:
+            var10008 = 119;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label316: {
+               var10000[0] = (new String(var10003)).intern();
+               var10003 = "\u001e\tnG\u001e\u001f".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label316;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 113;
+                     break;
+                  case 1:
+                     var10008 = 123;
+                     break;
+                  case 2:
+                     var10008 = 7;
+                     break;
+                  case 3:
+                     var10008 = 32;
+                     break;
+                  default:
+                     var10008 = 119;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[1] = (new String(var10004)).intern();
+            var10003 = "K[".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 113;
+                  break;
+               case 1:
+                  var10008 = 123;
+                  break;
+               case 2:
+                  var10008 = 7;
+                  break;
+               case 3:
+                  var10008 = 32;
+                  break;
+               default:
+                  var10008 = 119;
+               }
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  label384: {
+                     var10000[2] = (new String(var10003)).intern();
+                     var10003 = "QF'".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label384;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 113;
+                           break;
+                        case 1:
+                           var10008 = 123;
+                           break;
+                        case 2:
+                           var10008 = 7;
+                           break;
+                        case 3:
+                           var10008 = 32;
+                           break;
+                        default:
+                           var10008 = 119;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[3] = (new String(var10004)).intern();
+                  var10003 = "][".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[4] = (new String(var10003)).intern();
+                        e = var10000;
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 113;
+                        break;
+                     case 1:
+                        var10008 = 123;
+                        break;
+                     case 2:
+                        var10008 = 7;
+                        break;
+                     case 3:
+                        var10008 = 32;
+                        break;
+                     default:
+                        var10008 = 119;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[4] = (new String(var10004)).intern();
+                           e = var10000;
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+               var10007 = var10003[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 113;
+                  break;
+               case 1:
+                  var10008 = 123;
+                  break;
+               case 2:
+                  var10008 = 7;
+                  break;
+               case 3:
+                  var10008 = 32;
+                  break;
+               default:
+                  var10008 = 119;
+               }
+            }
+
+            while(true) {
+               while(true) {
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                     var10007 = var10004[var2];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 113;
+                        break;
+                     case 1:
+                        var10008 = 123;
+                        break;
+                     case 2:
+                        var10008 = 7;
+                        break;
+                     case 3:
+                        var10008 = 32;
+                        break;
+                     default:
+                        var10008 = 119;
+                     }
+                  } else {
+                     if (var2 <= var1) {
+                        label492: {
+                           var10000[2] = (new String(var10004)).intern();
+                           var10003 = "QF'".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label492;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 113;
+                                 break;
+                              case 1:
+                                 var10008 = 123;
+                                 break;
+                              case 2:
+                                 var10008 = 7;
+                                 break;
+                              case 3:
+                                 var10008 = 32;
+                                 break;
+                              default:
+                                 var10008 = 119;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "][".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[4] = (new String(var10003)).intern();
+                              e = var10000;
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 113;
+                              break;
+                           case 1:
+                              var10008 = 123;
+                              break;
+                           case 2:
+                              var10008 = 7;
+                              break;
+                           case 3:
+                              var10008 = 32;
+                              break;
+                           default:
+                              var10008 = 119;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 e = var10000;
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                     var10007 = var10004[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 113;
+                        break;
+                     case 1:
+                        var10008 = 123;
+                        break;
+                     case 2:
+                        var10008 = 7;
+                        break;
+                     case 3:
+                        var10008 = 32;
+                        break;
+                     default:
+                        var10008 = 119;
+                     }
+                  }
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 113;
+            break;
+         case 1:
+            var10008 = 123;
+            break;
+         case 2:
+            var10008 = 7;
+            break;
+         case 3:
+            var10008 = 32;
+            break;
+         default:
+            var10008 = 119;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 113;
+                  break;
+               case 1:
+                  var10008 = 123;
+                  break;
+               case 2:
+                  var10008 = 7;
+                  break;
+               case 3:
+                  var10008 = 32;
+                  break;
+               default:
+                  var10008 = 119;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label129: {
+                     var10000[0] = (new String(var10004)).intern();
+                     var10003 = "\u001e\tnG\u001e\u001f".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label129;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 113;
+                           break;
+                        case 1:
+                           var10008 = 123;
+                           break;
+                        case 2:
+                           var10008 = 7;
+                           break;
+                        case 3:
+                           var10008 = 32;
+                           break;
+                        default:
+                           var10008 = 119;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[1] = (new String(var10004)).intern();
+                  var10003 = "K[".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 113;
+                        break;
+                     case 1:
+                        var10008 = 123;
+                        break;
+                     case 2:
+                        var10008 = 7;
+                        break;
+                     case 3:
+                        var10008 = 32;
+                        break;
+                     default:
+                        var10008 = 119;
+                     }
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        label173: {
+                           var10000[2] = (new String(var10003)).intern();
+                           var10003 = "QF'".toCharArray();
+                           var10005 = var10003.length;
+                           var1 = 0;
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= 1) {
+                              var4 = var10003;
+                              var10006 = var1;
+                           } else {
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= var1) {
+                                 break label173;
+                              }
+
+                              var4 = var10003;
+                              var10006 = var1;
+                           }
+
+                           while(true) {
+                              var10007 = var4[var10006];
+                              switch(var1 % 5) {
+                              case 0:
+                                 var10008 = 113;
+                                 break;
+                              case 1:
+                                 var10008 = 123;
+                                 break;
+                              case 2:
+                                 var10008 = 7;
+                                 break;
+                              case 3:
+                                 var10008 = 32;
+                                 break;
+                              default:
+                                 var10008 = 119;
+                              }
+
+                              var4[var10006] = (char)(var10007 ^ var10008);
+                              ++var1;
+                              if (var2 == 0) {
+                                 var10006 = var2;
+                                 var4 = var10004;
+                              } else {
+                                 if (var2 <= var1) {
+                                    break;
+                                 }
+
+                                 var4 = var10004;
+                                 var10006 = var1;
+                              }
+                           }
+                        }
+
+                        var10000[3] = (new String(var10004)).intern();
+                        var10003 = "][".toCharArray();
+                        var10005 = var10003.length;
+                        var1 = 0;
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= 1) {
+                           var4 = var10003;
+                           var10006 = var1;
+                        } else {
+                           var10004 = var10003;
+                           var2 = var10005;
+                           if (var10005 <= var1) {
+                              var10000[4] = (new String(var10003)).intern();
+                              e = var10000;
+                              return;
+                           }
+
+                           var4 = var10003;
+                           var10006 = var1;
+                        }
+
+                        while(true) {
+                           var10007 = var4[var10006];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 113;
+                              break;
+                           case 1:
+                              var10008 = 123;
+                              break;
+                           case 2:
+                              var10008 = 7;
+                              break;
+                           case 3:
+                              var10008 = 32;
+                              break;
+                           default:
+                              var10008 = 119;
+                           }
+
+                           var4[var10006] = (char)(var10007 ^ var10008);
+                           ++var1;
+                           if (var2 == 0) {
+                              var10006 = var2;
+                              var4 = var10004;
+                           } else {
+                              if (var2 <= var1) {
+                                 var10000[4] = (new String(var10004)).intern();
+                                 e = var10000;
+                                 return;
+                              }
+
+                              var4 = var10004;
+                              var10006 = var1;
+                           }
+                        }
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                     var10007 = var10003[var1];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 113;
+                        break;
+                     case 1:
+                        var10008 = 123;
+                        break;
+                     case 2:
+                        var10008 = 7;
+                        break;
+                     case 3:
+                        var10008 = 32;
+                        break;
+                     default:
+                        var10008 = 119;
+                     }
+                  }
+
+                  while(true) {
+                     while(true) {
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                           var10007 = var10004[var2];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 113;
+                              break;
+                           case 1:
+                              var10008 = 123;
+                              break;
+                           case 2:
+                              var10008 = 7;
+                              break;
+                           case 3:
+                              var10008 = 32;
+                              break;
+                           default:
+                              var10008 = 119;
+                           }
+                        } else {
+                           if (var2 <= var1) {
+                              label93: {
+                                 var10000[2] = (new String(var10004)).intern();
+                                 var10003 = "QF'".toCharArray();
+                                 var10005 = var10003.length;
+                                 var1 = 0;
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= 1) {
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 } else {
+                                    var10004 = var10003;
+                                    var2 = var10005;
+                                    if (var10005 <= var1) {
+                                       break label93;
+                                    }
+
+                                    var4 = var10003;
+                                    var10006 = var1;
+                                 }
+
+                                 while(true) {
+                                    var10007 = var4[var10006];
+                                    switch(var1 % 5) {
+                                    case 0:
+                                       var10008 = 113;
+                                       break;
+                                    case 1:
+                                       var10008 = 123;
+                                       break;
+                                    case 2:
+                                       var10008 = 7;
+                                       break;
+                                    case 3:
+                                       var10008 = 32;
+                                       break;
+                                    default:
+                                       var10008 = 119;
+                                    }
+
+                                    var4[var10006] = (char)(var10007 ^ var10008);
+                                    ++var1;
+                                    if (var2 == 0) {
+                                       var10006 = var2;
+                                       var4 = var10004;
+                                    } else {
+                                       if (var2 <= var1) {
+                                          break;
+                                       }
+
+                                       var4 = var10004;
+                                       var10006 = var1;
+                                    }
+                                 }
+                              }
+
+                              var10000[3] = (new String(var10004)).intern();
+                              var10003 = "][".toCharArray();
+                              var10005 = var10003.length;
+                              var1 = 0;
+                              var10004 = var10003;
+                              var2 = var10005;
+                              if (var10005 <= 1) {
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              } else {
+                                 var10004 = var10003;
+                                 var2 = var10005;
+                                 if (var10005 <= var1) {
+                                    var10000[4] = (new String(var10003)).intern();
+                                    e = var10000;
+                                    return;
+                                 }
+
+                                 var4 = var10003;
+                                 var10006 = var1;
+                              }
+
+                              while(true) {
+                                 var10007 = var4[var10006];
+                                 switch(var1 % 5) {
+                                 case 0:
+                                    var10008 = 113;
+                                    break;
+                                 case 1:
+                                    var10008 = 123;
+                                    break;
+                                 case 2:
+                                    var10008 = 7;
+                                    break;
+                                 case 3:
+                                    var10008 = 32;
+                                    break;
+                                 default:
+                                    var10008 = 119;
+                                 }
+
+                                 var4[var10006] = (char)(var10007 ^ var10008);
+                                 ++var1;
+                                 if (var2 == 0) {
+                                    var10006 = var2;
+                                    var4 = var10004;
+                                 } else {
+                                    if (var2 <= var1) {
+                                       var10000[4] = (new String(var10004)).intern();
+                                       e = var10000;
+                                       return;
+                                    }
+
+                                    var4 = var10004;
+                                    var10006 = var1;
+                                 }
+                              }
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                           var10007 = var10004[var1];
+                           switch(var1 % 5) {
+                           case 0:
+                              var10008 = 113;
+                              break;
+                           case 1:
+                              var10008 = 123;
+                              break;
+                           case 2:
+                              var10008 = 7;
+                              break;
+                           case 3:
+                              var10008 = 32;
+                              break;
+                           default:
+                              var10008 = 119;
+                           }
+                        }
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 113;
+                  break;
+               case 1:
+                  var10008 = 123;
+                  break;
+               case 2:
+                  var10008 = 7;
+                  break;
+               case 3:
+                  var10008 = 32;
+                  break;
+               default:
+                  var10008 = 119;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/u.java b/testData/obfuscated/u.java
new file mode 100644
index 0000000..1ac386e
--- /dev/null
+++ b/testData/obfuscated/u.java
@@ -0,0 +1,5 @@
+public interface u {
+   void a(Class<?> var1) throws Exception;
+
+   void a() throws Exception;
+}
diff --git a/testData/obfuscated/v.java b/testData/obfuscated/v.java
new file mode 100644
index 0000000..d0831c5
--- /dev/null
+++ b/testData/obfuscated/v.java
@@ -0,0 +1,423 @@
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.logging.Level;
+
+public class v {
+   private static final String[] a;
+
+   public static Object a(Object var0) {
+      try {
+         if (var0 != null) {
+            a(var0, var0.getClass());
+         }
+
+         return var0;
+      } catch (IllegalArgumentException var1) {
+         throw var1;
+      }
+   }
+
+   private static void a(Object param0, Class<?> param1) {
+      // $FF: Couldn't be decompiled
+   }
+
+   private static void a(Field var0, Object var1) {
+      int var3 = y.d;
+
+      Throwable var10000;
+      boolean var10001;
+      label43: {
+         try {
+            if (var3 != 0) {
+               return;
+            }
+
+            if (!List.class.isAssignableFrom(var0.getType())) {
+               break label43;
+            }
+         } catch (Throwable var7) {
+            throw var7;
+         }
+
+         Throwable var2;
+         try {
+            var0.set(var1, t.b(((x)var0.getAnnotation(x.class)).a()));
+            return;
+         } catch (Throwable var5) {
+            var2 = var5;
+         }
+
+         try {
+            t.a.log(Level.WARNING, var1.getClass() + "." + var0.getName() + a[1] + var2.getMessage(), var2);
+            if (var3 == 0) {
+               return;
+            }
+         } catch (Throwable var6) {
+            var10000 = var6;
+            var10001 = false;
+            throw var10000;
+         }
+      }
+
+      try {
+         t.a.warning(var1.getClass() + "." + var0.getName() + a[2]);
+      } catch (Throwable var4) {
+         var10000 = var4;
+         var10001 = false;
+         throw var10000;
+      }
+   }
+
+   private static void b(Field var0, Object var1) {
+      try {
+         var0.set(var1, t.a(var0.getType()));
+      } catch (Throwable var3) {
+         t.a.log(Level.WARNING, var1.getClass() + "." + var0.getName() + a[0] + var3.getMessage(), var3);
+      }
+
+   }
+
+   public <I> I a(Class<I> var1) {
+      try {
+         return a(var1.newInstance());
+      } catch (Throwable var3) {
+         throw new IllegalArgumentException(var3);
+      }
+   }
+
+   static {
+      String[] var10000 = new String[3];
+      char[] var10003 = "]\u0007".toCharArray();
+      int var10005 = var10003.length;
+      int var1 = 0;
+      char[] var10004 = var10003;
+      int var2 = var10005;
+      char[] var4;
+      int var10006;
+      char var10007;
+      byte var10008;
+      if (var10005 <= 1) {
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 103;
+            break;
+         case 1:
+            var10008 = 39;
+            break;
+         case 2:
+            var10008 = 44;
+            break;
+         case 3:
+            var10008 = 46;
+            break;
+         default:
+            var10008 = 93;
+         }
+      } else {
+         var10004 = var10003;
+         var2 = var10005;
+         if (var10005 <= var1) {
+            label127: {
+               var10000[0] = (new String(var10003)).intern();
+               var10003 = "]\u0007".toCharArray();
+               var10005 = var10003.length;
+               var1 = 0;
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= 1) {
+                  var4 = var10003;
+                  var10006 = var1;
+               } else {
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= var1) {
+                     break label127;
+                  }
+
+                  var4 = var10003;
+                  var10006 = var1;
+               }
+
+               while(true) {
+                  var10007 = var4[var10006];
+                  switch(var1 % 5) {
+                  case 0:
+                     var10008 = 103;
+                     break;
+                  case 1:
+                     var10008 = 39;
+                     break;
+                  case 2:
+                     var10008 = 44;
+                     break;
+                  case 3:
+                     var10008 = 46;
+                     break;
+                  default:
+                     var10008 = 93;
+                  }
+
+                  var4[var10006] = (char)(var10007 ^ var10008);
+                  ++var1;
+                  if (var2 == 0) {
+                     var10006 = var2;
+                     var4 = var10004;
+                  } else {
+                     if (var2 <= var1) {
+                        break;
+                     }
+
+                     var4 = var10004;
+                     var10006 = var1;
+                  }
+               }
+            }
+
+            var10000[1] = (new String(var10004)).intern();
+            var10003 = "]\u0007lg3\rBOZ\u0011\u000eTX\u000e/\u0002VYG/\u0002C\fO}\rFZOs\u0012SEBs+N_Za\"\u0019\fO.GAEK1\u0003\u0007XW-\u0002".toCharArray();
+            var10005 = var10003.length;
+            var1 = 0;
+            var10004 = var10003;
+            var2 = var10005;
+            if (var10005 <= 1) {
+               var4 = var10003;
+               var10006 = var1;
+            } else {
+               var10004 = var10003;
+               var2 = var10005;
+               if (var10005 <= var1) {
+                  var10000[2] = (new String(var10003)).intern();
+                  a = var10000;
+                  return;
+               }
+
+               var4 = var10003;
+               var10006 = var1;
+            }
+
+            while(true) {
+               var10007 = var4[var10006];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 103;
+                  break;
+               case 1:
+                  var10008 = 39;
+                  break;
+               case 2:
+                  var10008 = 44;
+                  break;
+               case 3:
+                  var10008 = 46;
+                  break;
+               default:
+                  var10008 = 93;
+               }
+
+               var4[var10006] = (char)(var10007 ^ var10008);
+               ++var1;
+               if (var2 == 0) {
+                  var10006 = var2;
+                  var4 = var10004;
+               } else {
+                  if (var2 <= var1) {
+                     var10000[2] = (new String(var10004)).intern();
+                     a = var10000;
+                     return;
+                  }
+
+                  var4 = var10004;
+                  var10006 = var1;
+               }
+            }
+         }
+
+         var4 = var10003;
+         var10006 = var1;
+         var10007 = var10003[var1];
+         switch(var1 % 5) {
+         case 0:
+            var10008 = 103;
+            break;
+         case 1:
+            var10008 = 39;
+            break;
+         case 2:
+            var10008 = 44;
+            break;
+         case 3:
+            var10008 = 46;
+            break;
+         default:
+            var10008 = 93;
+         }
+      }
+
+      while(true) {
+         while(true) {
+            var4[var10006] = (char)(var10007 ^ var10008);
+            ++var1;
+            if (var2 == 0) {
+               var10006 = var2;
+               var4 = var10004;
+               var10007 = var10004[var2];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 103;
+                  break;
+               case 1:
+                  var10008 = 39;
+                  break;
+               case 2:
+                  var10008 = 44;
+                  break;
+               case 3:
+                  var10008 = 46;
+                  break;
+               default:
+                  var10008 = 93;
+               }
+            } else {
+               if (var2 <= var1) {
+                  label65: {
+                     var10000[0] = (new String(var10004)).intern();
+                     var10003 = "]\u0007".toCharArray();
+                     var10005 = var10003.length;
+                     var1 = 0;
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= 1) {
+                        var4 = var10003;
+                        var10006 = var1;
+                     } else {
+                        var10004 = var10003;
+                        var2 = var10005;
+                        if (var10005 <= var1) {
+                           break label65;
+                        }
+
+                        var4 = var10003;
+                        var10006 = var1;
+                     }
+
+                     while(true) {
+                        var10007 = var4[var10006];
+                        switch(var1 % 5) {
+                        case 0:
+                           var10008 = 103;
+                           break;
+                        case 1:
+                           var10008 = 39;
+                           break;
+                        case 2:
+                           var10008 = 44;
+                           break;
+                        case 3:
+                           var10008 = 46;
+                           break;
+                        default:
+                           var10008 = 93;
+                        }
+
+                        var4[var10006] = (char)(var10007 ^ var10008);
+                        ++var1;
+                        if (var2 == 0) {
+                           var10006 = var2;
+                           var4 = var10004;
+                        } else {
+                           if (var2 <= var1) {
+                              break;
+                           }
+
+                           var4 = var10004;
+                           var10006 = var1;
+                        }
+                     }
+                  }
+
+                  var10000[1] = (new String(var10004)).intern();
+                  var10003 = "]\u0007lg3\rBOZ\u0011\u000eTX\u000e/\u0002VYG/\u0002C\fO}\rFZOs\u0012SEBs+N_Za\"\u0019\fO.GAEK1\u0003\u0007XW-\u0002".toCharArray();
+                  var10005 = var10003.length;
+                  var1 = 0;
+                  var10004 = var10003;
+                  var2 = var10005;
+                  if (var10005 <= 1) {
+                     var4 = var10003;
+                     var10006 = var1;
+                  } else {
+                     var10004 = var10003;
+                     var2 = var10005;
+                     if (var10005 <= var1) {
+                        var10000[2] = (new String(var10003)).intern();
+                        a = var10000;
+                        return;
+                     }
+
+                     var4 = var10003;
+                     var10006 = var1;
+                  }
+
+                  while(true) {
+                     var10007 = var4[var10006];
+                     switch(var1 % 5) {
+                     case 0:
+                        var10008 = 103;
+                        break;
+                     case 1:
+                        var10008 = 39;
+                        break;
+                     case 2:
+                        var10008 = 44;
+                        break;
+                     case 3:
+                        var10008 = 46;
+                        break;
+                     default:
+                        var10008 = 93;
+                     }
+
+                     var4[var10006] = (char)(var10007 ^ var10008);
+                     ++var1;
+                     if (var2 == 0) {
+                        var10006 = var2;
+                        var4 = var10004;
+                     } else {
+                        if (var2 <= var1) {
+                           var10000[2] = (new String(var10004)).intern();
+                           a = var10000;
+                           return;
+                        }
+
+                        var4 = var10004;
+                        var10006 = var1;
+                     }
+                  }
+               }
+
+               var4 = var10004;
+               var10006 = var1;
+               var10007 = var10004[var1];
+               switch(var1 % 5) {
+               case 0:
+                  var10008 = 103;
+                  break;
+               case 1:
+                  var10008 = 39;
+                  break;
+               case 2:
+                  var10008 = 44;
+                  break;
+               case 3:
+                  var10008 = 46;
+                  break;
+               default:
+                  var10008 = 93;
+               }
+            }
+         }
+      }
+   }
+}
diff --git a/testData/obfuscated/w.java b/testData/obfuscated/w.java
new file mode 100644
index 0000000..d25151d
--- /dev/null
+++ b/testData/obfuscated/w.java
@@ -0,0 +1,9 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+public @interface w {
+}
diff --git a/testData/obfuscated/x.java b/testData/obfuscated/x.java
new file mode 100644
index 0000000..f9a151e
--- /dev/null
+++ b/testData/obfuscated/x.java
@@ -0,0 +1,10 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD})
+public @interface x {
+   Class<?> a();
+}
diff --git a/testData/obfuscated/y.java b/testData/obfuscated/y.java
new file mode 100644
index 0000000..d82c70f
--- /dev/null
+++ b/testData/obfuscated/y.java
@@ -0,0 +1,18 @@
+public class y<P> {
+   private P a;
+   private Class<P> b;
+   private boolean c;
+   public static int d;
+
+   private y(Class<P> var1) {
+      this.b = var1;
+   }
+
+   public static <P> y<P> a(Class<P> var0) {
+      return new y(var0);
+   }
+
+   public P a() {
+      // $FF: Couldn't be decompiled
+   }
+}
diff --git a/testData/obfuscated/z.java b/testData/obfuscated/z.java
new file mode 100644
index 0000000..dfb0e0b
--- /dev/null
+++ b/testData/obfuscated/z.java
@@ -0,0 +1,22 @@
+import java.util.List;
+
+public class z<P> {
+   private List<P> a;
+   private Class<P> b;
+
+   private z(Class<P> var1) {
+      this.b = var1;
+   }
+
+   public static <P> z<P> a(Class<P> var0) {
+      return new z(var0);
+   }
+
+   public List<P> a() {
+      // $FF: Couldn't be decompiled
+   }
+
+   public List<P> b() {
+      return t.b(this.b);
+   }
+}
diff --git a/testData/results/InvalidMethodSignature.dec b/testData/results/InvalidMethodSignature.dec
index 7b4f8c5..e4b567c 100644
--- a/testData/results/InvalidMethodSignature.dec
+++ b/testData/results/InvalidMethodSignature.dec
@@ -4,7 +4,6 @@ import a.a.a.a.a.k;
 import a.a.a.a.c.c;
 import a.a.a.a.c.j;
 import a.a.a.a.e.bg;
-import a.a.a.a.e.f.b;
 import java.io.File;
 
 class i implements bg {
@@ -18,7 +17,7 @@ class i implements bg {
 
    public void a(c var1, k var2, boolean var3) {
       File var4 = this.a.b().a(var1);// 2
-      b.a(this.b).add(var4);// 3
+      a.a.a.a.e.f.b.a(this.b).add(var4);// 3
    }// 4
 
    public void a(a.a.a.a.c.b var1) {
@@ -27,30 +26,30 @@ class i implements bg {
 
 class 'a/a/a/a/e/f/i' {
    method '<init> (La/a/a/a/e/f/b;La/a/a/a/c/j;)V' {
-      2      14
-      7      15
-      e      16
+      2      13
+      7      14
+      e      15
    }
 
    method 'a (La/a/a/a/c/c;La/a/a/a/a/k;Z)V' {
-      1      19
-      4      19
-      a      19
-      f      19
-      12      20
-      15      20
-      1a      20
-      20      21
+      1      18
+      4      18
+      a      18
+      f      18
+      12      19
+      15      19
+      1a      19
+      20      20
    }
 
    method 'a (La/a/a/a/c/b;)V' {
-      0      24
+      0      23
    }
 }
 
 Lines mapping:
-0 <-> 25
-1 <-> 15
-2 <-> 20
-3 <-> 21
-4 <-> 22
+0 <-> 24
+1 <-> 14
+2 <-> 19
+3 <-> 20
+4 <-> 21
diff --git a/testData/results/MoreAnnotations.dec b/testData/results/MoreAnnotations.dec
new file mode 100644
index 0000000..37302cc
--- /dev/null
+++ b/testData/results/MoreAnnotations.dec
@@ -0,0 +1,107 @@
+package pkg;
+
+public @interface MoreAnnotations {
+   @MoreAnnotations(
+      intValue = 1,
+      byteValue = 1,
+      floatValue = 1.0F,
+      doubleValue = 1.0D,
+      booleanValue = true,
+      shortValue = 1,
+      longValue = 1L,
+      charValue = '\n',
+      enumValue = MoreAnnotations.TestEnum.FirstValue,
+      annotationValue = @MoreAnnotations.NestedAnnotation("a"),
+      stringValue = "",
+      classValue = String.class
+   )
+   String annotatedWithValues = "";
+   @MoreAnnotations(
+      intArray = {},
+      byteArray = {},
+      floatArray = {},
+      doubleArray = {},
+      booleanArray = {},
+      shortArray = {},
+      longArray = {},
+      charArray = {},
+      enumArray = {},
+      annotationArray = {},
+      stringArray = {},
+      classArray = {}
+   )
+   String annotatedWithEmptyArrays = "";
+   @MoreAnnotations(
+      intArray = {1, 0, 2147483647, -2147483648},
+      byteArray = {1, 0, 127, -128, -1},
+      floatArray = {1.0F, 0.0F, 3.4028235E38F, 1.4E-45F, 0.0F / 0.0, 1.0F / 0.0, -1.0F / 0.0},
+      doubleArray = {1.0D, 0.0D, 1.7976931348623157E308D, 4.9E-324D, 0.0D / 0.0, 1.0D / 0.0, -1.0D / 0.0},
+      booleanArray = {true, false},
+      shortArray = {1, 0, 32767, -32768, -1},
+      longArray = {1L, 0L, 9223372036854775807L, -9223372036854775808L},
+      charArray = {'a', '\n', '\u0001', '\u0000', '\uffff', '\u0000'},
+      enumArray = {MoreAnnotations.TestEnum.FirstValue, MoreAnnotations.TestEnum.SecondValue},
+      annotationArray = {@MoreAnnotations.NestedAnnotation("a"), @MoreAnnotations.NestedAnnotation("b")},
+      stringArray = {"first", "second", ""},
+      classArray = {CharSequence.class, String.class, StringBuilder.class}
+   )
+   String annotatedWithArrays = "";
+
+   int intValue() default 1;
+
+   byte byteValue() default 1;
+
+   float floatValue() default 1.0F / 0.0;
+
+   double doubleValue() default 0.0D / 0.0;
+
+   boolean booleanValue() default true;
+
+   short shortValue() default 1;
+
+   long longValue() default 1L;
+
+   char charValue() default '0';
+
+   MoreAnnotations.TestEnum enumValue() default MoreAnnotations.TestEnum.FirstValue;
+
+   MoreAnnotations.NestedAnnotation annotationValue() default @MoreAnnotations.NestedAnnotation;
+
+   String stringValue() default "default";
+
+   Class<? extends CharSequence> classValue() default CharSequence.class;
+
+   int[] intArray() default {1, 0, 2147483647, -2147483648};
+
+   byte[] byteArray() default {1, 0, 127, -128, -1};
+
+   float[] floatArray() default {1.0F, 0.0F, 3.4028235E38F, 1.4E-45F, 0.0F / 0.0, 1.0F / 0.0, -1.0F / 0.0};
+
+   double[] doubleArray() default {1.0D, 0.0D, 1.7976931348623157E308D, 4.9E-324D, 0.0D / 0.0, 1.0D / 0.0, -1.0D / 0.0};
+
+   boolean[] booleanArray() default {true, false};
+
+   short[] shortArray() default {1, 0, 32767, -32768, -1};
+
+   long[] longArray() default {1L, 0L, 9223372036854775807L, -9223372036854775808L};
+
+   char[] charArray() default {'\u0001', '\u0000', '\uffff', '\u0000'};
+
+   MoreAnnotations.TestEnum[] enumArray() default {MoreAnnotations.TestEnum.FirstValue};
+
+   MoreAnnotations.NestedAnnotation[] annotationArray() default {@MoreAnnotations.NestedAnnotation};
+
+   String[] stringArray() default {"first", "second", ""};
+
+   Class<? extends CharSequence>[] classArray() default {CharSequence.class, String.class, StringBuilder.class};
+
+   public static enum TestEnum {
+      FirstValue,
+      SecondValue;
+   }
+
+   public @interface NestedAnnotation {
+      String value() default "MyString";
+   }
+}
+
diff --git a/testData/results/PrivateClasses.dec b/testData/results/PrivateClasses.dec
new file mode 100644
index 0000000..aa812da
--- /dev/null
+++ b/testData/results/PrivateClasses.dec
@@ -0,0 +1,473 @@
+package pkg;
+
+class PrivateClasses {
+   private static final Runnable R1 = new Runnable() {
+      public void run() {
+         final String s = "";// 11
+
+         class NonCapturingLocalR1 {
+            private final String s;
+
+            public NonCapturingLocalR1(String s) {
+               this.s = s;// 17
+            }// 18
+
+            public String toString() {
+               return this.s;// 22
+            }
+         }
+
+         (new NonCapturingLocalR1(s)).toString();// 39
+
+         class CapturingLocalR1 {
+            private final int i;
+
+            public CapturingLocalR1(int i) {
+               this.i = i;// 30
+            }// 31
+
+            public String toString() {
+               return s + ":" + this.i;// 35
+            }
+         }
+
+         (new CapturingLocalR1(42)).toString();// 40
+         PrivateClasses.Callable<String> c1 = new PrivateClasses.Callable<String>() {
+            public String call() {
+               return null;// 45
+            }
+         };// 42
+         PrivateClasses.Callable<String> c2 = new PrivateClasses.Callable<String>() {
+            public String call() {
+               return s;// 52
+            }
+         };// 49
+         ((String)c1.call() + (String)c2.call()).length();// 56
+      }// 57
+   };
+   private final Runnable R2 = new Runnable() {
+      public void run() {
+         final String s = "";// 63
+
+         class NonCapturingLocalR2 {
+            private final String s;
+
+            public NonCapturingLocalR2(String s) {
+               this.s = s;// 69
+            }// 70
+
+            public String toString() {
+               return this.s;// 74
+            }
+         }
+
+         (new NonCapturingLocalR2(s)).toString();// 91
+
+         class CapturingLocalR1 {
+            private final int i;
+
+            public CapturingLocalR1(int i) {
+               this.i = i;// 82
+            }// 83
+
+            public String toString() {
+               return s + ":" + this.i;// 87
+            }
+         }
+
+         (new CapturingLocalR1(42)).toString();// 92
+         PrivateClasses.Callable<String> c1 = new PrivateClasses.Callable<String>() {
+            public String call() {
+               return null;// 97
+            }
+         };// 94
+         PrivateClasses.Callable<String> c2 = new PrivateClasses.Callable<String>() {
+            public String call() {
+               return s;// 104
+            }
+         };// 101
+         ((String)c1.call() + (String)c2.call()).length();// 108
+      }// 109
+   };
+
+   public static void m1(final String s) {
+      class NonCapturingLocalM1 {
+         private final String s;
+
+         public NonCapturingLocalM1(String s) {
+            this.s = s;// 117
+         }// 118
+
+         public String toString() {
+            return this.s;// 122
+         }
+      }
+
+      (new NonCapturingLocalM1(s)).toString();// 139
+
+      class CapturingLocalM1 {
+         private final int i;
+
+         public CapturingLocalM1(int i) {
+            this.i = i;// 130
+         }// 131
+
+         public String toString() {
+            return s + ":" + this.i;// 135
+         }
+      }
+
+      (new CapturingLocalM1(42)).toString();// 140
+      PrivateClasses.Callable<String> c1 = new PrivateClasses.Callable<String>() {
+         public String call() {
+            return null;// 145
+         }
+      };// 142
+      PrivateClasses.Callable<String> c2 = new PrivateClasses.Callable<String>() {
+         public String call() {
+            return s;// 152
+         }
+      };// 149
+      ((String)c1.call() + (String)c2.call()).length();// 156
+   }// 157
+
+   public void m2(final String s) {
+      class NonCapturingLocalM2 {
+         private final String s;
+
+         public NonCapturingLocalM2(String s) {
+            this.s = s;// 164
+         }// 165
+
+         public String toString() {
+            return this.s;// 169
+         }
+      }
+
+      (new NonCapturingLocalM2(s)).toString();// 186
+
+      class CapturingLocalM2 {
+         private final int i;
+
+         public CapturingLocalM2(int i) {
+            this.i = i;// 177
+         }// 178
+
+         public String toString() {
+            return s + ":" + this.i;// 182
+         }
+      }
+
+      (new CapturingLocalM2(42)).toString();// 187
+      PrivateClasses.Callable<String> c1 = new PrivateClasses.Callable<String>() {
+         public String call() {
+            return null;// 192
+         }
+      };// 189
+      PrivateClasses.Callable<String> c2 = new PrivateClasses.Callable<String>() {
+         public String call() {
+            return s;// 199
+         }
+      };// 196
+      ((String)c1.call() + (String)c2.call()).length();// 203
+   }// 204
+
+   private interface Callable<T> {
+      T call();
+   }
+}
+
+class 'pkg/PrivateClasses$1$1NonCapturingLocalR1' {
+   method '<init> (Lpkg/PrivateClasses$1;Ljava/lang/String;)V' {
+      b      11
+      e      12
+   }
+
+   method 'toString ()Ljava/lang/String;' {
+      1      15
+      4      15
+   }
+}
+
+class 'pkg/PrivateClasses$1$1CapturingLocalR1' {
+   method '<init> (Lpkg/PrivateClasses$1;ILjava/lang/String;)V' {
+      10      25
+      13      26
+   }
+
+   method 'toString ()Ljava/lang/String;' {
+      e      29
+      14      29
+      1a      29
+      1d      29
+   }
+}
+
+class 'pkg/PrivateClasses$1$1' {
+   method 'call ()Ljava/lang/String;' {
+      0      36
+      1      36
+   }
+}
+
+class 'pkg/PrivateClasses$1$2' {
+   method 'call ()Ljava/lang/String;' {
+      4      41
+   }
+}
+
+class 'pkg/PrivateClasses$1' {
+   method 'run ()V' {
+      0      5
+      2      5
+      c      19
+      15      33
+      1b      33
+      27      38
+      31      43
+      3a      44
+      3f      44
+      46      44
+      4b      44
+      51      44
+      54      44
+      58      45
+   }
+}
+
+class 'pkg/PrivateClasses$2$1NonCapturingLocalR2' {
+   method '<init> (Lpkg/PrivateClasses$2;Ljava/lang/String;)V' {
+      b      55
+      e      56
+   }
+
+   method 'toString ()Ljava/lang/String;' {
+      1      59
+      4      59
+   }
+}
+
+class 'pkg/PrivateClasses$2$1CapturingLocalR1' {
+   method '<init> (Lpkg/PrivateClasses$2;ILjava/lang/String;)V' {
+      10      69
+      13      70
+   }
+
+   method 'toString ()Ljava/lang/String;' {
+      e      73
+      14      73
+      1a      73
+      1d      73
+   }
+}
+
+class 'pkg/PrivateClasses$2$1' {
+   method 'call ()Ljava/lang/String;' {
+      0      80
+      1      80
+   }
+}
+
+class 'pkg/PrivateClasses$2$2' {
+   method 'call ()Ljava/lang/String;' {
+      4      85
+   }
+}
+
+class 'pkg/PrivateClasses$2' {
+   method 'run ()V' {
+      0      49
+      2      49
+      c      63
+      15      77
+      1b      77
+      27      82
+      31      87
+      3a      88
+      3f      88
+      46      88
+      4b      88
+      51      88
+      54      88
+      58      89
+   }
+}
+
+class 'pkg/PrivateClasses$1NonCapturingLocalM1' {
+   method '<init> (Ljava/lang/String;)V' {
+      6      97
+      9      98
+   }
+
+   method 'toString ()Ljava/lang/String;' {
+      1      101
+      4      101
+   }
+}
+
+class 'pkg/PrivateClasses$1CapturingLocalM1' {
+   method '<init> (ILjava/lang/String;)V' {
+      b      111
+      e      112
+   }
+
+   method 'toString ()Ljava/lang/String;' {
+      e      115
+      14      115
+      1a      115
+      1d      115
+   }
+}
+
+class 'pkg/PrivateClasses$3' {
+   method 'call ()Ljava/lang/String;' {
+      0      122
+      1      122
+   }
+}
+
+class 'pkg/PrivateClasses$4' {
+   method 'call ()Ljava/lang/String;' {
+      4      127
+   }
+}
+
+class 'pkg/PrivateClasses' {
+   method 'm1 (Ljava/lang/String;)V' {
+      8      105
+      10      119
+      16      119
+      21      124
+      2a      129
+      33      130
+      38      130
+      3f      130
+      44      130
+      4a      130
+      4d      130
+      51      131
+   }
+
+   method 'm2 (Ljava/lang/String;)V' {
+      9      146
+      12      160
+      18      160
+      24      165
+      2e      170
+      37      171
+      3c      171
+      43      171
+      48      171
+      4e      171
+      51      171
+      55      172
+   }
+}
+
+class 'pkg/PrivateClasses$1NonCapturingLocalM2' {
+   method '<init> (Lpkg/PrivateClasses;Ljava/lang/String;)V' {
+      b      138
+      e      139
+   }
+
+   method 'toString ()Ljava/lang/String;' {
+      1      142
+      4      142
+   }
+}
+
+class 'pkg/PrivateClasses$1CapturingLocalM2' {
+   method '<init> (Lpkg/PrivateClasses;ILjava/lang/String;)V' {
+      10      152
+      13      153
+   }
+
+   method 'toString ()Ljava/lang/String;' {
+      e      156
+      14      156
+      1a      156
+      1d      156
+   }
+}
+
+class 'pkg/PrivateClasses$5' {
+   method 'call ()Ljava/lang/String;' {
+      0      163
+      1      163
+   }
+}
+
+class 'pkg/PrivateClasses$6' {
+   method 'call ()Ljava/lang/String;' {
+      4      168
+   }
+}
+
+Lines mapping:
+11 <-> 6
+17 <-> 12
+18 <-> 13
+22 <-> 16
+30 <-> 26
+31 <-> 27
+35 <-> 30
+39 <-> 20
+40 <-> 34
+42 <-> 39
+45 <-> 37
+49 <-> 44
+52 <-> 42
+56 <-> 45
+57 <-> 46
+63 <-> 50
+69 <-> 56
+70 <-> 57
+74 <-> 60
+82 <-> 70
+83 <-> 71
+87 <-> 74
+91 <-> 64
+92 <-> 78
+94 <-> 83
+97 <-> 81
+101 <-> 88
+104 <-> 86
+108 <-> 89
+109 <-> 90
+117 <-> 98
+118 <-> 99
+122 <-> 102
+130 <-> 112
+131 <-> 113
+135 <-> 116
+139 <-> 106
+140 <-> 120
+142 <-> 125
+145 <-> 123
+149 <-> 130
+152 <-> 128
+156 <-> 131
+157 <-> 132
+164 <-> 139
+165 <-> 140
+169 <-> 143
+177 <-> 153
+178 <-> 154
+182 <-> 157
+186 <-> 147
+187 <-> 161
+189 <-> 166
+192 <-> 164
+196 <-> 171
+199 <-> 169
+203 <-> 172
+204 <-> 173
+Not mapped:
+16
+29
+68
+81
+116
+129
+163
+176
diff --git a/testData/results/TestAccessReplace.dec b/testData/results/TestAccessReplace.dec
new file mode 100644
index 0000000..f365126
--- /dev/null
+++ b/testData/results/TestAccessReplace.dec
@@ -0,0 +1,69 @@
+package pkg;
+
+public class TestAccessReplace {
+   private static void fooS() {
+   }// 19
+
+   private void foo() {
+   }// 20
+
+   private static void fooSParams(long a, long b) {
+   }// 21
+
+   private void fooParams(long a, long b) {
+   }// 22
+
+   public class Inner {
+      public Inner(String b) {
+         TestAccessReplace.fooS();// 26
+         TestAccessReplace.this.foo();// 27
+         TestAccessReplace.fooSParams(1L, 2L);// 28
+         TestAccessReplace.this.fooParams(1L, 2L);// 29
+      }// 30
+   }
+}
+
+class 'pkg/TestAccessReplace' {
+   method 'fooS ()V' {
+      0      4
+   }
+
+   method 'foo ()V' {
+      0      7
+   }
+
+   method 'fooSParams (JJ)V' {
+      0      10
+   }
+
+   method 'fooParams (JJ)V' {
+      0      13
+   }
+}
+
+class 'pkg/TestAccessReplace$Inner' {
+   method '<init> (Lpkg/TestAccessReplace;Ljava/lang/String;)V' {
+      9      17
+      d      18
+      10      19
+      11      19
+      14      19
+      18      20
+      19      20
+      1c      20
+      1f      21
+   }
+}
+
+Lines mapping:
+19 <-> 5
+20 <-> 8
+21 <-> 11
+22 <-> 14
+26 <-> 18
+27 <-> 19
+28 <-> 20
+29 <-> 21
+30 <-> 22
+Not mapped:
+25
diff --git a/testData/results/TestAmbiguousCallWithDebugInfo.dec b/testData/results/TestAmbiguousCallWithDebugInfo.dec
index 40f1eaf..b697e79 100644
--- a/testData/results/TestAmbiguousCallWithDebugInfo.dec
+++ b/testData/results/TestAmbiguousCallWithDebugInfo.dec
@@ -11,7 +11,7 @@ class TestAmbiguousCall {
       IllegalArgumentException iae = new IllegalArgumentException();// 8
       this.m1((RuntimeException)iae, "RE");// 9
       this.m1(iae, "IAE");// 10
-      IllegalArgumentException re = new IllegalArgumentException();// 12
+      RuntimeException re = new IllegalArgumentException();// 12
       this.m1((RuntimeException)re, "RE");// 13
       this.m1((IllegalArgumentException)re, "IAE");// 14
    }// 15
diff --git a/testData/results/TestAnonymousClass.dec b/testData/results/TestAnonymousClass.dec
index 75d1df2..924b764 100644
--- a/testData/results/TestAnonymousClass.dec
+++ b/testData/results/TestAnonymousClass.dec
@@ -45,7 +45,7 @@ public abstract class TestAnonymousClass {
    };
 
    void foo(int var1) throws Exception {
-      if(var1 > 0) {// 10
+      if (var1 > 0) {// 10
          TestAnonymousClass.I var2 = new TestAnonymousClass.I() {
             public void foo() throws Exception {
                boolean var1 = true;// 13
diff --git a/testData/results/TestAnonymousClassConstructor.dec b/testData/results/TestAnonymousClassConstructor.dec
new file mode 100644
index 0000000..66960ce
--- /dev/null
+++ b/testData/results/TestAnonymousClassConstructor.dec
@@ -0,0 +1,308 @@
+package pkg;
+
+class TestAnonymousClassConstructor {
+   void innerPrivateString() {
+      TestAnonymousClassConstructor.InnerPrivateString var10001 = new TestAnonymousClassConstructor.InnerPrivateString("text") {// 5
+      };
+   }// 6
+
+   void innerPrivate() {
+      TestAnonymousClassConstructor.InnerPrivate var10001 = new TestAnonymousClassConstructor.InnerPrivate(3L, 4) {// 9
+      };
+   }// 10
+
+   void innerStaticPrivateString() {
+      TestAnonymousClassConstructor.InnerStaticPrivateString var10001 = new TestAnonymousClassConstructor.InnerStaticPrivateString("text") {// 13
+      };
+   }// 14
+
+   void innerStaticPrivate() {
+      TestAnonymousClassConstructor.InnerStaticPrivate var10001 = new TestAnonymousClassConstructor.InnerStaticPrivate(3L, 4) {// 17
+      };
+   }// 18
+
+   static void innerStaticPrivateStringStatic() {
+      TestAnonymousClassConstructor.InnerStaticPrivateString var10001 = new TestAnonymousClassConstructor.InnerStaticPrivateString("text") {// 21
+      };
+   }// 22
+
+   static void innerStaticPrivateStatic() {
+      TestAnonymousClassConstructor.InnerStaticPrivate var10001 = new TestAnonymousClassConstructor.InnerStaticPrivate(3L, 4) {// 25
+      };
+   }// 26
+
+   void innerPublicString() {
+      TestAnonymousClassConstructor.InnerPublicString var10001 = new TestAnonymousClassConstructor.InnerPublicString("text") {// 29
+      };
+   }// 30
+
+   void innerPublic() {
+      TestAnonymousClassConstructor.InnerPublic var10001 = new TestAnonymousClassConstructor.InnerPublic(3L, 4) {// 33
+      };
+   }// 34
+
+   void innerStaticPublicString() {
+      TestAnonymousClassConstructor.InnerStaticPublicString var10001 = new TestAnonymousClassConstructor.InnerStaticPublicString("text") {// 37
+      };
+   }// 38
+
+   void innerStaticPublic() {
+      TestAnonymousClassConstructor.InnerStaticPublic var10001 = new TestAnonymousClassConstructor.InnerStaticPublic(3L, 4) {// 41
+      };
+   }// 42
+
+   static void innerStaticPublicStringStatic() {
+      TestAnonymousClassConstructor.InnerStaticPublicString var10001 = new TestAnonymousClassConstructor.InnerStaticPublicString("text") {// 45
+      };
+   }// 46
+
+   static void innerStaticPublicStatic() {
+      TestAnonymousClassConstructor.InnerStaticPublic var10001 = new TestAnonymousClassConstructor.InnerStaticPublic(3L, 4) {// 49
+      };
+   }// 50
+
+   static void n(String s) {
+      System.out.println("n(): " + s);// 53
+   }// 54
+
+   static class InnerStaticPublic {
+      public InnerStaticPublic(long a, int b) {
+         TestAnonymousClassConstructor.n(a + "+" + b);// 100
+      }// 101
+   }
+
+   static class InnerStaticPublicString {
+      public InnerStaticPublicString(String s) {
+         TestAnonymousClassConstructor.n(s);// 94
+      }// 95
+   }
+
+   class InnerPublic {
+      public InnerPublic(long a, int b) {
+         TestAnonymousClassConstructor.n(a + "+" + b);// 88
+      }// 89
+   }
+
+   class InnerPublicString {
+      public InnerPublicString(String s) {
+         TestAnonymousClassConstructor.n(s);// 82
+      }// 83
+   }
+
+   static class InnerStaticPrivate {
+      private InnerStaticPrivate(long a, int b) {
+         TestAnonymousClassConstructor.n(a + "+" + b);// 76
+      }// 77
+   }
+
+   static class InnerStaticPrivateString {
+      private InnerStaticPrivateString(String s) {
+         TestAnonymousClassConstructor.n(s);// 70
+      }// 71
+   }
+
+   class InnerPrivate {
+      private InnerPrivate(long a, int b) {
+         TestAnonymousClassConstructor.n(a + "+" + b);// 64
+      }// 65
+   }
+
+   class InnerPrivateString {
+      private InnerPrivateString(String s) {
+         TestAnonymousClassConstructor.n(s);// 58
+      }// 59
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor' {
+   method 'innerPrivateString ()V' {
+      5      4
+      b      6
+   }
+
+   method 'innerPrivate ()V' {
+      5      9
+      8      9
+      d      11
+   }
+
+   method 'innerStaticPrivateString ()V' {
+      5      14
+      b      16
+   }
+
+   method 'innerStaticPrivate ()V' {
+      5      19
+      8      19
+      d      21
+   }
+
+   method 'innerStaticPrivateStringStatic ()V' {
+      4      24
+      a      26
+   }
+
+   method 'innerStaticPrivateStatic ()V' {
+      4      29
+      7      29
+      c      31
+   }
+
+   method 'innerPublicString ()V' {
+      5      34
+      b      36
+   }
+
+   method 'innerPublic ()V' {
+      5      39
+      8      39
+      d      41
+   }
+
+   method 'innerStaticPublicString ()V' {
+      5      44
+      b      46
+   }
+
+   method 'innerStaticPublic ()V' {
+      5      49
+      8      49
+      d      51
+   }
+
+   method 'innerStaticPublicStringStatic ()V' {
+      4      54
+      a      56
+   }
+
+   method 'innerStaticPublicStatic ()V' {
+      4      59
+      7      59
+      c      61
+   }
+
+   method 'n (Ljava/lang/String;)V' {
+      0      64
+      a      64
+      13      64
+      16      64
+      19      65
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor$InnerStaticPublic' {
+   method '<init> (JI)V' {
+      f      69
+      18      69
+      1b      69
+      1e      70
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor$InnerStaticPublicString' {
+   method '<init> (Ljava/lang/String;)V' {
+      5      75
+      8      76
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor$InnerPublic' {
+   method '<init> (Lpkg/TestAnonymousClassConstructor;JI)V' {
+      14      81
+      1e      81
+      21      81
+      24      82
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor$InnerPublicString' {
+   method '<init> (Lpkg/TestAnonymousClassConstructor;Ljava/lang/String;)V' {
+      a      87
+      d      88
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor$InnerStaticPrivate' {
+   method '<init> (JI)V' {
+      f      93
+      18      93
+      1b      93
+      1e      94
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor$InnerStaticPrivateString' {
+   method '<init> (Ljava/lang/String;)V' {
+      5      99
+      8      100
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor$InnerPrivate' {
+   method '<init> (Lpkg/TestAnonymousClassConstructor;JI)V' {
+      14      105
+      1e      105
+      21      105
+      24      106
+   }
+}
+
+class 'pkg/TestAnonymousClassConstructor$InnerPrivateString' {
+   method '<init> (Lpkg/TestAnonymousClassConstructor;Ljava/lang/String;)V' {
+      a      111
+      d      112
+   }
+}
+
+Lines mapping:
+5 <-> 5
+6 <-> 7
+9 <-> 10
+10 <-> 12
+13 <-> 15
+14 <-> 17
+17 <-> 20
+18 <-> 22
+21 <-> 25
+22 <-> 27
+25 <-> 30
+26 <-> 32
+29 <-> 35
+30 <-> 37
+33 <-> 40
+34 <-> 42
+37 <-> 45
+38 <-> 47
+41 <-> 50
+42 <-> 52
+45 <-> 55
+46 <-> 57
+49 <-> 60
+50 <-> 62
+53 <-> 65
+54 <-> 66
+58 <-> 112
+59 <-> 113
+64 <-> 106
+65 <-> 107
+70 <-> 100
+71 <-> 101
+76 <-> 94
+77 <-> 95
+82 <-> 88
+83 <-> 89
+88 <-> 82
+89 <-> 83
+94 <-> 76
+95 <-> 77
+100 <-> 70
+101 <-> 71
+Not mapped:
+57
+63
+69
+75
+81
+87
+93
+99
diff --git a/testData/results/TestAnonymousParamNames.dec b/testData/results/TestAnonymousParamNames.dec
new file mode 100644
index 0000000..810799c
--- /dev/null
+++ b/testData/results/TestAnonymousParamNames.dec
@@ -0,0 +1,22 @@
+package pkg;
+
+public class TestAnonymousParamNames {
+   private final TestAnonymousParamNames.Clazz reference = new TestAnonymousParamNames.Clazz(0L, false) {
+   };
+
+   private class Clazz {
+      public Clazz(long paramL, boolean paramB) {
+      }// 25
+   }
+}
+
+class 'pkg/TestAnonymousParamNames$Clazz' {
+   method '<init> (Lpkg/TestAnonymousParamNames;JZ)V' {
+      9      8
+   }
+}
+
+Lines mapping:
+25 <-> 9
+Not mapped:
+24
diff --git a/testData/results/TestAnonymousParams.dec b/testData/results/TestAnonymousParams.dec
new file mode 100644
index 0000000..c487941
--- /dev/null
+++ b/testData/results/TestAnonymousParams.dec
@@ -0,0 +1,36 @@
+package pkg;
+
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class TestAnonymousParams {
+   void foo(InputStream in, final int a) throws IOException {
+      FilterInputStream filterInputStream = new FilterInputStream(in) {
+         public int read() throws IOException {
+            return a;// 27
+         }
+      };// 24
+      filterInputStream.read();// 30
+   }// 31
+}
+
+class 'pkg/TestAnonymousParams$1' {
+   method 'read ()I' {
+      4      10
+   }
+}
+
+class 'pkg/TestAnonymousParams' {
+   method 'foo (Ljava/io/InputStream;I)V' {
+      a      12
+      c      13
+      10      14
+   }
+}
+
+Lines mapping:
+24 <-> 13
+27 <-> 11
+30 <-> 14
+31 <-> 15
diff --git a/testData/results/TestAnonymousSignature.dec b/testData/results/TestAnonymousSignature.dec
new file mode 100644
index 0000000..95ad203
--- /dev/null
+++ b/testData/results/TestAnonymousSignature.dec
@@ -0,0 +1,50 @@
+package pkg;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+
+public class TestAnonymousSignature {
+   public static void main(String[] var0) {
+      System.out.println(new ArrayList<String>() {// 25
+         public int size() {
+            return super.size();// 28
+         }
+      });
+      System.out.println(new Comparator<String>() {// 33
+         public int compare(String var1, String var2) {
+            return 0;// 36
+         }
+      });
+   }// 39
+}
+
+class 'pkg/TestAnonymousSignature$1' {
+   method 'size ()I' {
+      1      9
+      4      9
+   }
+}
+
+class 'pkg/TestAnonymousSignature$2' {
+   method 'compare (Ljava/lang/String;Ljava/lang/String;)I' {
+      0      14
+      1      14
+   }
+}
+
+class 'pkg/TestAnonymousSignature' {
+   method 'main ([Ljava/lang/String;)V' {
+      0      7
+      a      7
+      d      12
+      17      12
+      1a      17
+   }
+}
+
+Lines mapping:
+25 <-> 8
+28 <-> 10
+33 <-> 13
+36 <-> 15
+39 <-> 18
diff --git a/testData/results/TestAsserts.dec b/testData/results/TestAsserts.dec
new file mode 100644
index 0000000..f260d9e
--- /dev/null
+++ b/testData/results/TestAsserts.dec
@@ -0,0 +1,34 @@
+package pkg;
+
+public class TestAsserts {
+   public static int foo() {
+      byte var0 = 1;// 21
+
+      assert var0 > 1;// 22
+
+      assert var0 > 1 && var0 < 5;// 23
+
+      return 1;// 24
+   }
+}
+
+class 'pkg/TestAsserts' {
+   method 'foo ()I' {
+      0      4
+      1      4
+      9      6
+      a      6
+      1c      8
+      1d      8
+      21      8
+      22      8
+      2d      10
+      2e      10
+   }
+}
+
+Lines mapping:
+21 <-> 5
+22 <-> 7
+23 <-> 9
+24 <-> 11
diff --git a/testData/results/TestClashName.dec b/testData/results/TestClashName.dec
new file mode 100644
index 0000000..2a9a731
--- /dev/null
+++ b/testData/results/TestClashName.dec
@@ -0,0 +1,108 @@
+package pkg;
+
+@SharedName4
+public class TestClashName extends ext.TestClashNameParent implements TestClashNameIface {
+   int TestClashNameParent = 0;
+   int TestClashNameIface = 0;
+   int SharedName1 = 0;
+   int SharedName4 = 0;
+   int SharedName5 = 0;
+   int i;
+   int j;
+   int k;
+   int l;
+   int m;
+   int n;
+   SharedName1 p;
+   SharedName5<SharedName1> q;
+
+   public TestClashName() {
+      this.i = pkg.SharedName1.f;// 59
+      this.j = NonSharedName.f;// 60
+      this.k = SharedName2.f;// 61
+      this.l = pkg.SharedName3.f;// 62
+      this.m = pkg.SharedName1.getF();// 63
+      this.n = NonSharedName.getF();// 64
+      this.p = null;// 65
+      this.q = null;// 67
+   }
+
+   @SharedName4
+   public int m() {
+      int var1 = this.i;// 73
+      pkg.SharedName1.f = this.j;// 74
+      int var2 = SharedName2.f;// 75
+      NonSharedName.f = this.k;// 76
+      int var3 = NonSharedName.f;// 77
+      return var1 + var2 + var3;// 78
+   }
+
+   public void f() {
+   }// 82
+}
+
+class 'pkg/TestClashName' {
+   method '<init> ()V' {
+      1e      19
+      21      19
+      25      20
+      28      20
+      2c      21
+      2f      21
+      33      22
+      36      22
+      3a      23
+      3d      23
+      41      24
+      44      24
+      48      25
+      49      25
+      4d      26
+      4e      26
+      51      27
+   }
+
+   method 'm ()I' {
+      1      31
+      4      31
+      6      32
+      9      32
+      c      33
+      f      33
+      11      34
+      14      34
+      17      35
+      1a      35
+      1d      36
+      1f      36
+      20      36
+   }
+
+   method 'f ()V' {
+      0      40
+   }
+}
+
+Lines mapping:
+59 <-> 20
+60 <-> 21
+61 <-> 22
+62 <-> 23
+63 <-> 24
+64 <-> 25
+65 <-> 26
+67 <-> 27
+73 <-> 32
+74 <-> 33
+75 <-> 34
+76 <-> 35
+77 <-> 36
+78 <-> 37
+82 <-> 41
+Not mapped:
+52
+53
+54
+55
+56
+57
diff --git a/testData/results/TestClassCast.dec b/testData/results/TestClassCast.dec
index c45fad8..e807294 100644
--- a/testData/results/TestClassCast.dec
+++ b/testData/results/TestClassCast.dec
@@ -6,7 +6,7 @@ import java.util.List;
 public class TestClassCast {
    public void test(List var1) {
       Object var2 = var1;// 22
-      if(var1 != null) {// 23
+      if (var1 != null) {// 23
          ((List)(var2 = new ArrayList(var1))).add("23");// 24
       }
 
diff --git a/testData/results/TestClassFields.dec b/testData/results/TestClassFields.dec
index 75ece1e..ea272ea 100644
--- a/testData/results/TestClassFields.dec
+++ b/testData/results/TestClassFields.dec
@@ -3,23 +3,35 @@ package pkg;
 public class TestClassFields {
    private static int[] sizes;
    private static String[] names = new String[]{"name1", "name2"};
+   private static final int SIZE;
 
    static {
-      sizes = new int[names.length];// 26
-   }// 27
+      sizes = new int[names.length];// 15
+      TestClassFields.Inner.staticMutable = 3;// 17
+      SIZE = TestClassFields.Inner.staticMutable;// 18
+   }// 19
+
+   private static class Inner {
+      private static int staticMutable;
+   }
 }
 
 class 'pkg/TestClassFields' {
    method '<clinit> ()V' {
-      11      7
-      14      7
-      17      7
-      1a      8
+      11      8
+      14      8
+      17      8
+      1b      9
+      1f      10
+      22      10
+      25      11
    }
 }
 
 Lines mapping:
-26 <-> 8
-27 <-> 9
+15 <-> 9
+17 <-> 10
+18 <-> 11
+19 <-> 12
 Not mapped:
-25
+14
diff --git a/testData/results/TestClassLambda.dec b/testData/results/TestClassLambda.dec
index 751537c..cae1518 100644
--- a/testData/results/TestClassLambda.dec
+++ b/testData/results/TestClassLambda.dec
@@ -5,20 +5,17 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.OptionalInt;
-import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.function.IntBinaryOperator;
-import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 public class TestClassLambda {
    public int field = 0;
 
    public void testLambda() {
-      List var1 = Arrays.asList(new Integer[]{Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(3), Integer.valueOf(4), Integer.valueOf(5), Integer.valueOf(6), Integer.valueOf(7)});// 29
+      List var1 = Arrays.asList(1, 2, 3, 4, 5, 6, 7);// 29
       int var2 = (int)Math.random();// 30
       var1.forEach((var2x) -> {// 32
-         int var3 = 2 * var2x.intValue();// 33
+         int var3 = 2 * var2x;// 33
          System.out.println(var3 + var2 + this.field);// 34
       });// 35
    }// 36
@@ -90,43 +87,51 @@ public class TestClassLambda {
 
 class 'pkg/TestClassLambda' {
    method 'lambda$testLambda$0 (ILjava/lang/Integer;)V' {
-      0      20
-      2      20
-      5      20
-      6      20
-      7      21
-      c      21
-      e      21
-      11      21
-      12      21
-      15      22
+      0      17
+      2      17
+      5      17
+      6      17
+      7      18
+      c      18
+      e      18
+      11      18
+      12      18
+      15      19
    }
 
    method 'testLambda ()V' {
-      7      17
-      8      17
-      e      17
-      f      17
-      15      17
-      16      17
-      1c      17
-      1d      17
-      23      17
-      24      17
-      2a      17
-      2c      17
-      33      17
-      35      17
-      39      17
-      3c      17
-      3d      18
-      40      18
-      41      18
-      4a      19
-      4f      23
+      7      14
+      8      14
+      e      14
+      f      14
+      15      14
+      16      14
+      1c      14
+      1d      14
+      23      14
+      24      14
+      2a      14
+      2c      14
+      33      14
+      35      14
+      39      14
+      3c      14
+      3d      15
+      40      15
+      41      15
+      4a      16
+      4f      20
    }
 
    method 'lambda$testLambda1$1 (I)V' {
+      0      25
+      a      25
+      13      25
+      16      25
+      19      26
+   }
+
+   method 'lambda$testLambda1$2 (I)V' {
       0      28
       a      28
       13      28
@@ -134,153 +139,145 @@ class 'pkg/TestClassLambda' {
       19      29
    }
 
-   method 'lambda$testLambda1$2 (I)V' {
-      0      31
-      a      31
-      13      31
-      16      31
-      19      32
-   }
-
    method 'testLambda1 ()V' {
-      0      26
-      3      26
-      4      26
-      b      29
-      12      32
-      13      33
+      0      23
+      3      23
+      4      23
+      b      26
+      12      29
+      13      30
    }
 
    method 'lambda$testLambda2$3 (II)I' {
-      2      37
-      5      37
+      2      34
+      5      34
    }
 
    method 'testLambda2 ()V' {
-      5      36
-      9      39
+      5      33
+      9      36
    }
 
    method 'testLambda3 ()V' {
-      5      42
-      9      43
+      5      39
+      9      40
    }
 
    method 'testLambda4 ()V' {
-      5      46
-      9      47
+      5      43
+      9      44
    }
 
    method 'testLambda5 ()V' {
-      0      50
-      2      50
-      e      51
-      12      52
+      0      47
+      2      47
+      e      48
+      12      49
    }
 
    method 'lambda$testLambda6$4 (IILjava/lang/String;)Z' {
-      2      59
-      5      59
-      9      59
-      d      59
-      15      59
+      2      56
+      5      56
+      9      56
+      d      56
+      15      56
    }
 
    method 'testLambda6 ()V' {
-      7      55
-      9      56
-      e      56
-      f      56
-      10      56
-      12      57
-      17      57
-      18      57
-      19      57
-      22      58
-      28      61
+      7      52
+      9      53
+      e      53
+      f      53
+      10      53
+      12      54
+      17      54
+      18      54
+      19      54
+      22      55
+      28      58
    }
 
    method 'testLambda7 ([Ljava/lang/annotation/Annotation;)V' {
-      1      64
-      9      64
-      f      65
+      1      61
+      9      61
+      f      62
    }
 
    method 'reduce (Ljava/util/function/IntBinaryOperator;)Ljava/util/OptionalInt;' {
-      0      68
-      1      68
+      0      65
+      1      65
    }
 
    method 'function (Ljava/util/function/Supplier;)Ljava/lang/String;' {
-      1      72
-      6      72
-      9      72
+      1      69
+      6      69
+      9      69
    }
 
    method 'localMax (II)I' {
-      0      76
-      1      76
+      0      73
+      1      73
    }
 
    method 'lambda$null$5 (I)V' {
-      0      83
-      a      83
-      13      83
-      16      83
-      19      84
+      0      80
+      a      80
+      13      80
+      16      80
+      19      81
    }
 
    method 'lambda$nestedLambdas$6 (I)V' {
-      6      84
-      7      85
-      11      85
-      1a      85
-      1d      85
-      20      86
+      6      81
+      7      82
+      11      82
+      1a      82
+      1d      82
+      20      83
    }
 
    method 'nestedLambdas ()V' {
-      0      80
-      1      80
-      8      86
-      9      87
+      0      77
+      1      77
+      8      83
+      9      84
    }
 }
 
 Lines mapping:
-29 <-> 18
-30 <-> 19
-32 <-> 20
-33 <-> 21
-34 <-> 22
-35 <-> 23
-36 <-> 24
-39 <-> 27
-40 <-> 30
-41 <-> 33
-42 <-> 34
-45 <-> 37
-46 <-> 40
-49 <-> 43
-50 <-> 44
-53 <-> 47
-54 <-> 48
-57 <-> 51
-58 <-> 52
-59 <-> 53
-62 <-> 56
-63 <-> 57
-64 <-> 58
-65 <-> 59
-66 <-> 62
-69 <-> 65
-70 <-> 66
-73 <-> 69
-77 <-> 73
-81 <-> 77
-85 <-> 81
-86 <-> 87
-87 <-> 85
-88 <-> 86
-89 <-> 87
-90 <-> 88
+29 <-> 15
+30 <-> 16
+32 <-> 17
+33 <-> 18
+34 <-> 19
+35 <-> 20
+36 <-> 21
+39 <-> 24
+40 <-> 27
+41 <-> 30
+42 <-> 31
+45 <-> 34
+46 <-> 37
+49 <-> 40
+50 <-> 41
+53 <-> 44
+54 <-> 45
+57 <-> 48
+58 <-> 49
+59 <-> 50
+62 <-> 53
+63 <-> 54
+64 <-> 55
+65 <-> 56
+66 <-> 59
+69 <-> 62
+70 <-> 63
+73 <-> 66
+77 <-> 70
+81 <-> 74
+85 <-> 78
+86 <-> 84
+87 <-> 82
+88 <-> 83
+89 <-> 84
+90 <-> 85
diff --git a/testData/results/TestClassLoop.dec b/testData/results/TestClassLoop.dec
index 5f386c2..55e369b 100644
--- a/testData/results/TestClassLoop.dec
+++ b/testData/results/TestClassLoop.dec
@@ -12,7 +12,7 @@ public class TestClassLoop {
 
       while(true) {
          try {
-            if(!var0) {// 33
+            if (!var0) {// 33
                return;// 34
             }
          } finally {
@@ -30,7 +30,7 @@ public class TestClassLoop {
                System.out.println("1");// 49
                break;
             } finally {
-               if(var0) {// 52
+               if (var0) {// 52
                   System.out.println("3");// 53
                   continue;// 54
                }
@@ -58,12 +58,12 @@ public class TestClassLoop {
                break;
             }
 
-            if(var3) {// 78
+            if (var3) {// 78
                throw new NumberFormatException("multiple points");// 80
             }
 
             var5 = var2;// 82
-            if(var4) {// 83
+            if (var4) {// 83
                var5 = var2 - 1;// 84
             }
 
diff --git a/testData/results/TestClassSimpleBytecodeMapping.dec b/testData/results/TestClassSimpleBytecodeMapping.dec
index a48375a..8883fab 100644
--- a/testData/results/TestClassSimpleBytecodeMapping.dec
+++ b/testData/results/TestClassSimpleBytecodeMapping.dec
@@ -9,7 +9,7 @@ public class TestClassSimpleBytecodeMapping {
          }// 18
       });
       this.test2("1");// 21
-      if(Math.random() > 0.0D) {// 23
+      if (Math.random() > 0.0D) {// 23
          System.out.println("0");// 24
          return 0;// 25
       } else {
diff --git a/testData/results/TestClassTypes.dec b/testData/results/TestClassTypes.dec
index c957f3f..1b76bbb 100644
--- a/testData/results/TestClassTypes.dec
+++ b/testData/results/TestClassTypes.dec
@@ -7,13 +7,13 @@ public class TestClassTypes {
    public void testBoolean() {
       byte var1 = 0;// 25
       long var2 = System.currentTimeMillis();// 26
-      if(var2 % 2L > 0L) {// 28
+      if (var2 % 2L > 0L) {// 28
          var1 = 1;// 29
-      } else if(var2 % 3L > 0L) {// 31
+      } else if (var2 % 3L > 0L) {// 31
          var1 = 2;// 32
       }
 
-      if(var1 == 1) {// 35
+      if (var1 == 1) {// 35
          System.out.println();// 36
       }
 
@@ -40,7 +40,7 @@ public class TestClassTypes {
 
    public void testAssignmentType(List var1) {
       Object var2 = var1;// 61
-      if(var1 != null) {// 63
+      if (var1 != null) {// 63
          ((List)(var2 = new ArrayList(var1))).add("23");// 64
       }
 
diff --git a/testData/results/TestClassVar.dec b/testData/results/TestClassVar.dec
index 548c6f4..14e8b9e 100644
--- a/testData/results/TestClassVar.dec
+++ b/testData/results/TestClassVar.dec
@@ -9,7 +9,7 @@ public class TestClassVar {
          try {
             System.out.println();// 29
          } finally {
-            if(this.field_boolean) {// 32
+            if (this.field_boolean) {// 32
                System.out.println();// 33
             }
 
@@ -28,10 +28,9 @@ public class TestClassVar {
       while(var1 < 10) {// 47
          int var2;
          for(var2 = var1; var1 < 10 && var1 == 0; ++var1) {// 49 51
-            ;
          }
 
-         if(var2 != var1) {// 54
+         if (var2 != var1) {// 54
             System.out.println();// 55
          }
       }
@@ -72,10 +71,10 @@ class 'pkg/TestClassVar' {
       d      29
       11      29
       14      29
-      1c      33
-      1f      34
-      22      34
-      28      38
+      1c      32
+      1f      33
+      22      33
+      28      37
    }
 }
 
@@ -90,8 +89,8 @@ Lines mapping:
 47 <-> 28
 49 <-> 30
 51 <-> 30
-54 <-> 34
-55 <-> 35
-58 <-> 39
+54 <-> 33
+55 <-> 34
+58 <-> 38
 Not mapped:
 57
diff --git a/testData/results/TestConstructorReference.dec b/testData/results/TestConstructorReference.dec
new file mode 100644
index 0000000..ee2a50d
--- /dev/null
+++ b/testData/results/TestConstructorReference.dec
@@ -0,0 +1,16 @@
+public class TestConstructorReference {
+   void boo() {
+      Runnable aNew = TestConstructorReference::new;// 22
+   }// 23
+}
+
+class 'TestConstructorReference' {
+   method 'boo ()V' {
+      5      2
+      6      3
+   }
+}
+
+Lines mapping:
+22 <-> 3
+23 <-> 4
diff --git a/testData/results/TestEmptyBlocks.dec b/testData/results/TestEmptyBlocks.dec
new file mode 100644
index 0000000..72a39b6
--- /dev/null
+++ b/testData/results/TestEmptyBlocks.dec
@@ -0,0 +1,47 @@
+import java.util.Random;
+
+public class TestEmptyBlocks {
+   public static void foo() {
+      try {
+         boolean var0 = false;// 22
+      } catch (Exception var1) {// 23
+      }
+
+      for(int i = 0; i < 5; ++i) {// 27
+      }
+
+      while((new Random()).nextBoolean()) {// 31
+      }
+
+      if ((new Random()).nextBoolean()) {// 35
+      }
+
+   }// 38
+}
+
+class 'TestEmptyBlocks' {
+   method 'foo ()V' {
+      0      5
+      1      5
+      5      6
+      6      9
+      7      9
+      9      9
+      a      9
+      d      9
+      1a      12
+      2a      15
+      2d      15
+      30      18
+   }
+}
+
+Lines mapping:
+22 <-> 6
+23 <-> 7
+27 <-> 10
+31 <-> 13
+35 <-> 16
+38 <-> 19
+Not mapped:
+25
diff --git a/testData/results/TestEnum.dec b/testData/results/TestEnum.dec
index 06649c0..6fabfae 100644
--- a/testData/results/TestEnum.dec
+++ b/testData/results/TestEnum.dec
@@ -6,8 +6,8 @@ public enum TestEnum {
       public void m() {
       }// 22
    },
-   E3("-"),
-   E4("+") {
+   E3("-", TestEnum.Type.ODD),
+   E4("+", TestEnum.Type.EVEN) {
       public void m() {
       }// 27
    };
@@ -15,14 +15,19 @@ public enum TestEnum {
    private String s;
 
    public void m() {
-   }// 30
+   }// 32
 
    private TestEnum() {
-      this("?");// 34
+      this("?", (TestEnum.Type)null);// 36
    }
 
-   private TestEnum(@Deprecated String var3) {
-      this.s = var3;// 35
+   private TestEnum(@Deprecated String var3, TestEnum.Type var4) {
+      this.s = var3;// 37
+   }
+
+   private static enum Type {
+      ODD,
+      EVEN;
    }
 }
 
@@ -46,10 +51,11 @@ class 'pkg/TestEnum' {
    method '<init> (Ljava/lang/String;I)V' {
       3      20
       5      20
-      8      21
+      6      20
+      9      21
    }
 
-   method '<init> (Ljava/lang/String;ILjava/lang/String;)V' {
+   method '<init> (Ljava/lang/String;ILjava/lang/String;Lpkg/TestEnum$Type;)V' {
       8      24
       b      25
    }
@@ -58,6 +64,6 @@ class 'pkg/TestEnum' {
 Lines mapping:
 22 <-> 7
 27 <-> 12
-30 <-> 18
-34 <-> 21
-35 <-> 25
+32 <-> 18
+36 <-> 21
+37 <-> 25
diff --git a/testData/results/TestExtendingSubclass.dec b/testData/results/TestExtendingSubclass.dec
new file mode 100644
index 0000000..5e13985
--- /dev/null
+++ b/testData/results/TestExtendingSubclass.dec
@@ -0,0 +1,35 @@
+package pkg;
+
+public class TestExtendingSubclass {
+   class Subclass2 extends TestExtendingSubclass.Subclass1 {
+      Subclass2(String name) {
+         super(name);// 14
+      }// 15
+   }
+
+   class Subclass1 {
+      Subclass1(String name) {
+      }// 9
+   }
+}
+
+class 'pkg/TestExtendingSubclass$Subclass2' {
+   method '<init> (Lpkg/TestExtendingSubclass;Ljava/lang/String;)V' {
+      8      5
+      b      6
+   }
+}
+
+class 'pkg/TestExtendingSubclass$Subclass1' {
+   method '<init> (Lpkg/TestExtendingSubclass;Ljava/lang/String;)V' {
+      9      11
+   }
+}
+
+Lines mapping:
+9 <-> 12
+14 <-> 6
+15 <-> 7
+Not mapped:
+8
+13
diff --git a/testData/results/TestFieldSingleAccess.dec b/testData/results/TestFieldSingleAccess.dec
new file mode 100644
index 0000000..268c866
--- /dev/null
+++ b/testData/results/TestFieldSingleAccess.dec
@@ -0,0 +1,40 @@
+package pkg;
+
+public final class TestFieldSingleAccess {
+   public Integer field;
+
+   public final void test() {
+      Integer var10000 = this.field;
+      if (var10000 != null) {
+         System.out.println(var10000);
+      }
+
+   }
+
+   public final void test1() {
+      synchronized(this.field) {
+         System.out.println('1');
+      }
+   }
+}
+
+class 'pkg/TestFieldSingleAccess' {
+   method 'test ()V' {
+      1      6
+      5      7
+      8      8
+      c      8
+      f      11
+   }
+
+   method 'test1 ()V' {
+      1      14
+      6      14
+      7      15
+      a      15
+      c      15
+      19      17
+   }
+}
+
+Lines mapping:
diff --git a/testData/results/TestGenericArgs.dec b/testData/results/TestGenericArgs.dec
new file mode 100644
index 0000000..330ded5
--- /dev/null
+++ b/testData/results/TestGenericArgs.dec
@@ -0,0 +1,55 @@
+package pkg;
+
+public class TestGenericArgs {
+   private static <T> void genericSingle(Class<T> var0) {
+   }// 4
+
+   private static <T> void genericVarArgs(Class<T>... var0) {
+   }// 6
+
+   private static <T> void genericArray(Class<T>[] var0) {
+   }// 8
+
+   private static <T> void single(Class var0) {
+   }// 10
+
+   private static <T> void varArgs(Class... var0) {
+   }// 12
+
+   private static <T> void array(Class[] var0) {
+   }// 14
+}
+
+class 'pkg/TestGenericArgs' {
+   method 'genericSingle (Ljava/lang/Class;)V' {
+      0      4
+   }
+
+   method 'genericVarArgs ([Ljava/lang/Class;)V' {
+      0      7
+   }
+
+   method 'genericArray ([Ljava/lang/Class;)V' {
+      0      10
+   }
+
+   method 'single (Ljava/lang/Class;)V' {
+      0      13
+   }
+
+   method 'varArgs ([Ljava/lang/Class;)V' {
+      0      16
+   }
+
+   method 'array ([Ljava/lang/Class;)V' {
+      0      19
+   }
+}
+
+Lines mapping:
+4 <-> 5
+6 <-> 8
+8 <-> 11
+10 <-> 14
+12 <-> 17
+14 <-> 20
diff --git a/testData/results/TestGroovyClass.dec b/testData/results/TestGroovyClass.dec
new file mode 100644
index 0000000..02ede11
--- /dev/null
+++ b/testData/results/TestGroovyClass.dec
@@ -0,0 +1,230 @@
+package pkg;
+
+import groovy.lang.Closure;
+import groovy.lang.GroovyObject;
+import groovy.lang.MetaClass;
+import java.util.concurrent.Callable;
+import org.codehaus.groovy.runtime.GeneratedClosure;
+import org.codehaus.groovy.runtime.ScriptBytecodeAdapter;
+import org.codehaus.groovy.runtime.callsite.CallSite;
+
+public class TestGroovyClass implements GroovyObject {
+   private final TestGroovyClass.Nested n;
+   private final TestGroovyClass.Inner i;
+   private final Runnable r;
+   private final Callable<String> c;
+
+   public TestGroovyClass() {
+      CallSite[] var1 = $getCallSiteArray();
+      Object var2 = var1[0].callConstructor(TestGroovyClass.Nested.class);// 9
+      this.n = (TestGroovyClass.Nested)ScriptBytecodeAdapter.castToType(var2, TestGroovyClass.Nested.class);
+      Object var3 = var1[1].callConstructor(TestGroovyClass.Inner.class, this);
+      this.i = (TestGroovyClass.Inner)ScriptBytecodeAdapter.castToType(var3, TestGroovyClass.Inner.class);
+      TestGroovyClass._closure1 var4 = new TestGroovyClass._closure1(this, this);// 10
+      this.r = var4;
+      TestGroovyClass._closure2 var5 = new TestGroovyClass._closure2(this, this);
+      this.c = var5;
+      MetaClass var6 = this.$getStaticMetaClass();
+      this.metaClass = var6;
+   }
+
+   public final TestGroovyClass.Nested getN() {
+      return this.n;
+   }
+
+   public final TestGroovyClass.Inner getI() {
+      return this.i;
+   }
+
+   public final Runnable getR() {
+      return this.r;
+   }
+
+   public final Callable<String> getC() {
+      return this.c;
+   }
+
+   public static class Nested implements GroovyObject {
+      public Nested() {
+         CallSite[] var1 = $getCallSiteArray();
+         MetaClass var2 = this.$getStaticMetaClass();
+         this.metaClass = var2;
+      }
+   }
+
+   public class Inner implements GroovyObject {
+      public Inner() {
+         CallSite[] var2 = $getCallSiteArray();
+         super();
+         MetaClass var4 = this.$getStaticMetaClass();
+         this.metaClass = var4;
+      }
+   }
+
+   public class _closure1 extends Closure implements GeneratedClosure {
+      public _closure1(Object _outerInstance, Object _thisObject) {
+         CallSite[] var3 = $getCallSiteArray();
+         super(_outerInstance, _thisObject);
+      }
+
+      public Object doCall(Object it) {
+         CallSite[] var2 = $getCallSiteArray();
+         return var2[0].callCurrent(this, "I'm runnable");// 11
+      }
+
+      public Object doCall() {
+         CallSite[] var1 = $getCallSiteArray();
+         return this.doCall((Object)null);
+      }
+   }
+
+   public class _closure2 extends Closure implements GeneratedClosure {
+      public _closure2(Object _outerInstance, Object _thisObject) {
+         CallSite[] var3 = $getCallSiteArray();
+         super(_outerInstance, _thisObject);
+      }
+
+      public Object doCall(Object it) {
+         CallSite[] var2 = $getCallSiteArray();
+         return "I'm callable";// 12
+      }
+
+      public Object doCall() {
+         CallSite[] var1 = $getCallSiteArray();
+         return this.doCall((Object)null);
+      }
+   }
+}
+
+class 'pkg/TestGroovyClass' {
+   method '<init> ()V' {
+      4      17
+      7      17
+      9      18
+      b      18
+      c      18
+      e      18
+      13      18
+      15      19
+      17      19
+      1a      19
+      1f      19
+      25      20
+      27      20
+      28      20
+      2b      20
+      30      20
+      32      21
+      34      21
+      37      21
+      3c      21
+      4a      22
+      50      23
+      5f      24
+      65      25
+      6c      26
+      6f      26
+      75      27
+      7b      28
+   }
+
+   method 'getN ()Lpkg/TestGroovyClass$Nested;' {
+      1      31
+      4      31
+   }
+
+   method 'getI ()Lpkg/TestGroovyClass$Inner;' {
+      1      35
+      4      35
+   }
+
+   method 'getR ()Ljava/lang/Runnable;' {
+      1      39
+      4      39
+   }
+
+   method 'getC ()Ljava/util/concurrent/Callable;' {
+      1      43
+      4      43
+   }
+}
+
+class 'pkg/TestGroovyClass$Nested' {
+   method '<init> ()V' {
+      4      48
+      7      48
+      9      49
+      c      49
+      10      50
+      15      51
+   }
+}
+
+class 'pkg/TestGroovyClass$Inner' {
+   method '<init> (Lpkg/TestGroovyClass;)V' {
+      0      56
+      3      56
+      f      57
+      13      58
+      16      58
+      1c      59
+      22      60
+   }
+}
+
+class 'pkg/TestGroovyClass$_closure1' {
+   method '<init> (Ljava/lang/Object;Ljava/lang/Object;)V' {
+      0      65
+      3      65
+      7      66
+      a      67
+   }
+
+   method 'doCall (Ljava/lang/Object;)Ljava/lang/Object;' {
+      0      70
+      3      70
+      5      71
+      7      71
+      9      71
+      b      71
+      10      71
+   }
+
+   method 'doCall ()Ljava/lang/Object;' {
+      0      75
+      3      75
+      5      76
+      6      76
+      9      76
+   }
+}
+
+class 'pkg/TestGroovyClass$_closure2' {
+   method '<init> (Ljava/lang/Object;Ljava/lang/Object;)V' {
+      0      82
+      3      82
+      7      83
+      a      84
+   }
+
+   method 'doCall (Ljava/lang/Object;)Ljava/lang/Object;' {
+      0      87
+      3      87
+      4      88
+      6      88
+   }
+
+   method 'doCall ()Ljava/lang/Object;' {
+      0      92
+      3      92
+      5      93
+      6      93
+      9      93
+   }
+}
+
+Lines mapping:
+9 <-> 19
+10 <-> 23
+11 <-> 72
+12 <-> 89
diff --git a/testData/results/TestGroovyTrait.dec b/testData/results/TestGroovyTrait.dec
new file mode 100644
index 0000000..f36832a
--- /dev/null
+++ b/testData/results/TestGroovyTrait.dec
@@ -0,0 +1,17 @@
+package pkg;
+
+import groovy.transform.Trait;
+import org.codehaus.groovy.transform.trait.Traits.Implemented;
+
+@Trait
+public interface TestGroovyTrait {
+   @Implemented
+   Object myMethod();
+
+   @Implemented
+   Object getMyField();
+
+   @Implemented
+   void setMyField(Object var1);
+}
+
diff --git a/testData/results/TestIffSimplification.dec b/testData/results/TestIffSimplification.dec
new file mode 100644
index 0000000..595c4cb
--- /dev/null
+++ b/testData/results/TestIffSimplification.dec
@@ -0,0 +1,107 @@
+package pkg;
+
+public class TestIffSimplification {
+   public int simpleIff(boolean status, int[] values) {
+      return status ? values[0] : values[1];// 7
+   }
+
+   public int simpleIf(boolean status, int[] values) {
+      return status ? values[0] : values[1];// 11 12 15
+   }
+
+   public int nestedIf(boolean status, boolean condition, int[] values) {
+      if (status) {// 20
+         return condition ? values[2] : values[0];// 21 22 25
+      } else {
+         return values[1];// 29
+      }
+   }
+
+   public int compareTo(int mc1, int mc2, byte csg1, byte csg2, double score1, double score2, int doc1, int doc2) {
+      if (mc1 != mc2) {// 34
+         return mc1 < mc2 ? 1 : -1;// 35
+      } else if (csg1 != csg2) {// 38
+         return csg1 < csg2 ? 1 : -1;// 39
+      } else if (Math.abs(score1 - score2) < 1.0E-6D) {// 42
+         return doc1 < doc2 ? -1 : 1;// 43
+      } else {
+         return score1 < score2 ? 1 : -1;// 46
+      }
+   }
+}
+
+class 'pkg/TestIffSimplification' {
+   method 'simpleIff (Z[I)I' {
+      1      4
+      5      4
+      6      4
+      b      4
+      c      4
+      d      4
+   }
+
+   method 'simpleIf (Z[I)I' {
+      1      8
+      5      8
+      6      8
+      9      8
+      a      8
+   }
+
+   method 'nestedIf (ZZ[I)I' {
+      1      12
+      5      13
+      9      13
+      a      13
+      d      13
+      e      13
+      11      15
+      12      15
+      13      15
+   }
+
+   method 'compareTo (IIBBDDII)I' {
+      2      20
+      7      21
+      a      21
+      e      21
+      f      21
+      13      22
+      19      23
+      1c      23
+      20      23
+      21      23
+      26      24
+      27      24
+      2a      24
+      2d      24
+      2e      24
+      35      25
+      38      25
+      3c      25
+      3d      25
+      42      27
+      43      27
+      46      27
+      4a      27
+      4b      27
+   }
+}
+
+Lines mapping:
+7 <-> 5
+11 <-> 9
+12 <-> 9
+15 <-> 9
+20 <-> 13
+21 <-> 14
+22 <-> 14
+25 <-> 14
+29 <-> 16
+34 <-> 21
+35 <-> 22
+38 <-> 23
+39 <-> 24
+42 <-> 25
+43 <-> 26
+46 <-> 28
diff --git a/testData/results/TestIllegalVarName.dec b/testData/results/TestIllegalVarName.dec
new file mode 100644
index 0000000..3eb1ea5
--- /dev/null
+++ b/testData/results/TestIllegalVarName.dec
@@ -0,0 +1,33 @@
+package pkg;
+
+import kotlin.Metadata;
+import kotlin.jvm.internal.Intrinsics;
+import org.jetbrains.annotations.NotNull;
+
+@Metadata(
+   mv = {1, 1, 0},
+   bv = {1, 0, 0},
+   k = 1,
+   d1 = {"\u0000\u001a\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\b\u0002\n\u0002\u0010\u000e\n\u0002\b\u0002\n\u0002\u0010\b\n\u0000\u0018\u00002\u00020\u0001B\u0005¢\u0006\u0002\u0010\u0002J\u0016\u0010\u0003\u001a\u00020\u00042\u0006\u0010\u0005\u001a\u00020\u00042\u0006\u0010\u0006\u001a\u00020\u0007¨\u0006\b"},
+   d2 = {"Lpkg/TestIllegalVarName;", "", "()V", "m", "", "this", "enum", "", "java-decompiler-plugin"}
+)
+public final class TestIllegalVarName {
+   @NotNull
+   public final String m(@NotNull String var1, int var2) {
+      Intrinsics.checkParameterIsNotNull(var1, "this");
+      return var1 + '/' + var2;// 5
+   }
+}
+
+class 'pkg/TestIllegalVarName' {
+   method 'm (Ljava/lang/String;I)Ljava/lang/String;' {
+      1      16
+      3      16
+      11      17
+      1a      17
+      1d      17
+   }
+}
+
+Lines mapping:
+5 <-> 18
diff --git a/testData/results/TestInUse.dec b/testData/results/TestInUse.dec
new file mode 100644
index 0000000..c3fe83c
--- /dev/null
+++ b/testData/results/TestInUse.dec
@@ -0,0 +1,53 @@
+package pkg;
+
+public class TestInUse {
+   public int getInt() {
+      return 42;// 5
+   }
+
+   protected int reuse() {
+      int i = 0;// 9
+      int d = 0;
+      int result = 0;// 10
+
+      do {
+         d = this.getInt();// 12
+         result -= d;// 13
+         ++i;// 15
+      } while(i < 10);
+
+      return result;// 16
+   }
+}
+
+class 'pkg/TestInUse' {
+   method 'getInt ()I' {
+      0      4
+      2      4
+   }
+
+   method 'reuse ()I' {
+      0      8
+      1      8
+      2      9
+      3      9
+      4      10
+      5      10
+      7      13
+      a      13
+      e      14
+      f      15
+      13      16
+      15      16
+      19      18
+   }
+}
+
+Lines mapping:
+5 <-> 5
+9 <-> 9
+10 <-> 11
+12 <-> 14
+13 <-> 15
+15 <-> 16
+16 <-> 19
diff --git a/testData/results/TestInner2.dec b/testData/results/TestInner2.dec
new file mode 100644
index 0000000..2bc40f9
--- /dev/null
+++ b/testData/results/TestInner2.dec
@@ -0,0 +1,89 @@
+package pkg;
+
+class TestInner2 {
+   private TestInner2() {
+   }// 4
+
+   private TestInner2(int a) {
+   }// 5
+
+   static class AnotherStatic2 extends TestInner2 {
+      AnotherStatic2() {
+         super(2);// 25
+      }// 26
+   }
+
+   class Another2 extends TestInner2 {
+      Another2() {
+         super(2);// 19
+      }// 20
+   }
+
+   static class AnotherStatic extends TestInner2 {
+      AnotherStatic() {
+      }// 14
+   }
+
+   class Another extends TestInner2 {
+      Another() {
+      }// 9
+   }
+}
+
+class 'pkg/TestInner2' {
+   method '<init> ()V' {
+      4      4
+   }
+
+   method '<init> (I)V' {
+      4      7
+   }
+}
+
+class 'pkg/TestInner2$AnotherStatic2' {
+   method '<init> ()V' {
+      1      11
+      2      11
+      3      11
+      6      12
+   }
+}
+
+class 'pkg/TestInner2$Another2' {
+   method '<init> (Lpkg/TestInner2;)V' {
+      6      17
+      7      17
+      8      17
+      b      18
+   }
+}
+
+class 'pkg/TestInner2$AnotherStatic' {
+   method '<init> ()V' {
+      1      23
+      2      23
+      5      24
+   }
+}
+
+class 'pkg/TestInner2$Another' {
+   method '<init> (Lpkg/TestInner2;)V' {
+      6      29
+      7      29
+      a      30
+   }
+}
+
+Lines mapping:
+4 <-> 5
+5 <-> 8
+8 <-> 30
+9 <-> 31
+13 <-> 24
+14 <-> 25
+19 <-> 18
+20 <-> 19
+25 <-> 12
+26 <-> 13
+Not mapped:
+18
diff --git a/testData/results/TestInnerClassConstructor.dec b/testData/results/TestInnerClassConstructor.dec
index 235d50f..f15701a 100644
--- a/testData/results/TestInnerClassConstructor.dec
+++ b/testData/results/TestInnerClassConstructor.dec
@@ -1,40 +1,65 @@
 package pkg;
 
 class TestInnerClassConstructor {
-   void m() {
+   void l() {
       new TestInnerClassConstructor.Inner("text");// 5
    }// 6
 
-   void n(String var1) {
-      System.out.println("n(): " + var1);// 9
+   void m() {
+      new TestInnerClassConstructor.Another(3, 4);// 9
    }// 10
 
+   void n(String var1) {
+      System.out.println("n(): " + var1);// 13
+   }// 14
+
+   private class Another {
+      private Another(int var2, int var3) {
+         TestInnerClassConstructor.this.n(var2 + "+" + var3);// 24
+      }// 25
+   }
+
    final class Inner {
       private Inner(String var2) {
-         TestInnerClassConstructor.this.n(var2);// 14
-      }// 15
+         TestInnerClassConstructor.this.n(var2);// 18
+      }// 19
    }
 }
 
 class 'pkg/TestInnerClassConstructor' {
-   method 'm ()V' {
+   method 'l ()V' {
       5      4
       c      5
    }
 
+   method 'm ()V' {
+      5      8
+      6      8
+      c      9
+   }
+
    method 'n (Ljava/lang/String;)V' {
-      0      8
-      a      8
-      13      8
-      16      8
-      19      9
+      0      12
+      a      12
+      13      12
+      16      12
+      19      13
+   }
+}
+
+class 'pkg/TestInnerClassConstructor$Another' {
+   method '<init> (Lpkg/TestInnerClassConstructor;II)V' {
+      15      17
+      1e      17
+      21      17
+      24      18
    }
 }
 
 class 'pkg/TestInnerClassConstructor$Inner' {
    method '<init> (Lpkg/TestInnerClassConstructor;Ljava/lang/String;)V' {
-      b      13
-      e      14
+      b      23
+      e      24
    }
 }
 
@@ -43,7 +68,12 @@ Lines mapping:
 6 <-> 6
 9 <-> 9
 10 <-> 10
+13 <-> 13
 14 <-> 14
-15 <-> 15
+18 <-> 24
+19 <-> 25
+24 <-> 18
+25 <-> 19
 Not mapped:
-13
+17
+23
diff --git a/testData/results/TestInnerLocal.dec b/testData/results/TestInnerLocal.dec
index 6ca3a7e..af4fb30 100644
--- a/testData/results/TestInnerLocal.dec
+++ b/testData/results/TestInnerLocal.dec
@@ -1,133 +1,135 @@
+package pkg;
+
 public class TestInnerLocal {
    public static void testStaticMethod() {
       class Inner {
          final String x;
 
-         public Inner(String var1) {
-            this.x = var1;// 22
-         }// 23
+         public Inner(@Deprecated String x) {
+            this.x = x;// 8
+         }// 9
       }
 
-      new Inner("test");// 25
-      new TestInnerLocal.Inner1Static("test");// 26
-      new TestInnerLocal.Inner1Static.Inner2Static("test");// 27
-   }// 28
+      new Inner("test");// 11
+      new TestInnerLocal.Inner1Static("test");// 12
+      new TestInnerLocal.Inner1Static.Inner2Static("test");// 13
+   }// 14
 
    public void testMethod() {
       class Inner {
          final String x;
 
-         public Inner(String var2) {
-            this.x = var2;// 34
-         }// 35
+         public Inner(@Deprecated String x) {
+            this.x = x;// 20
+         }// 21
       }
 
-      new Inner("test");// 37
-      new TestInnerLocal.Inner1Static("test");// 38
-      new TestInnerLocal.Inner1("test");// 39
-      new TestInnerLocal.Inner1Static.Inner2Static("test");// 40
-   }// 41
+      new Inner("test");// 23
+      new TestInnerLocal.Inner1Static("test");// 24
+      new TestInnerLocal.Inner1("test");// 25
+      new TestInnerLocal.Inner1Static.Inner2Static("test");// 26
+   }// 27
 
    static class Inner1Static {
       final String x;
 
-      public Inner1Static(String var1) {
-         this.x = var1;// 53
-      }// 54
+      public Inner1Static(@Deprecated String x) {
+         this.x = x;// 39
+      }// 40
 
       public static class Inner2Static {
          final String x;
 
-         public Inner2Static(String var1) {
-            this.x = var1;// 59
-         }// 60
+         public Inner2Static(@Deprecated String x) {
+            this.x = x;// 45
+         }// 46
       }
    }
 
    class Inner1 {
       final String x;
 
-      public Inner1(String var2) {
-         this.x = var2;// 46
-      }// 47
+      public Inner1(@Deprecated String x) {
+         this.x = x;// 32
+      }// 33
    }
 }
 
-class 'TestInnerLocal$1Inner' {
+class 'pkg/TestInnerLocal$1Inner' {
    method '<init> (Ljava/lang/String;)V' {
-      6      6
-      9      7
+      6      8
+      9      9
    }
 }
 
-class 'TestInnerLocal' {
+class 'pkg/TestInnerLocal' {
    method 'testStaticMethod ()V' {
-      4      10
-      e      11
-      18      12
-      1e      13
+      4      12
+      e      13
+      18      14
+      1e      15
    }
 
    method 'testMethod ()V' {
-      5      24
-      f      25
-      1a      26
-      24      27
-      2a      28
+      5      26
+      f      27
+      1a      28
+      24      29
+      2a      30
    }
 }
 
-class 'TestInnerLocal$2Inner' {
-   method '<init> (LTestInnerLocal;Ljava/lang/String;)V' {
-      b      20
-      e      21
+class 'pkg/TestInnerLocal$2Inner' {
+   method '<init> (Lpkg/TestInnerLocal;Ljava/lang/String;)V' {
+      b      22
+      e      23
    }
 }
 
-class 'TestInnerLocal$Inner1Static' {
+class 'pkg/TestInnerLocal$Inner1Static' {
    method '<init> (Ljava/lang/String;)V' {
-      6      34
-      9      35
+      6      36
+      9      37
    }
 }
 
-class 'TestInnerLocal$Inner1Static$Inner2Static' {
+class 'pkg/TestInnerLocal$Inner1Static$Inner2Static' {
    method '<init> (Ljava/lang/String;)V' {
-      6      41
-      9      42
+      6      43
+      9      44
    }
 }
 
-class 'TestInnerLocal$Inner1' {
-   method '<init> (LTestInnerLocal;Ljava/lang/String;)V' {
-      b      50
-      e      51
+class 'pkg/TestInnerLocal$Inner1' {
+   method '<init> (Lpkg/TestInnerLocal;Ljava/lang/String;)V' {
+      b      52
+      e      53
    }
 }
 
 Lines mapping:
-22 <-> 7
-23 <-> 8
-25 <-> 11
-26 <-> 12
-27 <-> 13
-28 <-> 14
-34 <-> 21
-35 <-> 22
-37 <-> 25
-38 <-> 26
-39 <-> 27
-40 <-> 28
-41 <-> 29
-46 <-> 51
-47 <-> 52
-53 <-> 35
-54 <-> 36
-59 <-> 42
-60 <-> 43
+8 <-> 9
+9 <-> 10
+11 <-> 13
+12 <-> 14
+13 <-> 15
+14 <-> 16
+20 <-> 23
+21 <-> 24
+23 <-> 27
+24 <-> 28
+25 <-> 29
+26 <-> 30
+27 <-> 31
+32 <-> 53
+33 <-> 54
+39 <-> 37
+40 <-> 38
+45 <-> 44
+46 <-> 45
 Not mapped:
-21
-33
-45
-52
-58
+7
+19
+31
+38
+44
diff --git a/testData/results/TestInnerLocalPkg.dec b/testData/results/TestInnerLocalPkg.dec
deleted file mode 100644
index 7cafa41..0000000
--- a/testData/results/TestInnerLocalPkg.dec
+++ /dev/null
@@ -1,135 +0,0 @@
-package pkg;
-
-public class TestInnerLocalPkg {
-   public static void testStaticMethod() {
-      class Inner {
-         final String x;
-
-         public Inner(String var1) {
-            this.x = var1;// 24
-         }// 25
-      }
-
-      new Inner("test");// 27
-      new TestInnerLocalPkg.Inner1Static("test");// 28
-      new TestInnerLocalPkg.Inner1Static.Inner2Static("test");// 29
-   }// 30
-
-   public void testMethod() {
-      class Inner {
-         final String x;
-
-         public Inner(String var2) {
-            this.x = var2;// 36
-         }// 37
-      }
-
-      new Inner("test");// 39
-      new TestInnerLocalPkg.Inner1Static("test");// 40
-      new TestInnerLocalPkg.Inner1("test");// 41
-      new TestInnerLocalPkg.Inner1Static.Inner2Static("test");// 42
-   }// 43
-
-   static class Inner1Static {
-      final String x;
-
-      public Inner1Static(String var1) {
-         this.x = var1;// 55
-      }// 56
-
-      public static class Inner2Static {
-         final String x;
-
-         public Inner2Static(String var1) {
-            this.x = var1;// 61
-         }// 62
-      }
-   }
-
-   class Inner1 {
-      final String x;
-
-      public Inner1(String var2) {
-         this.x = var2;// 48
-      }// 49
-   }
-}
-
-class 'pkg/TestInnerLocalPkg$1Inner' {
-   method '<init> (Ljava/lang/String;)V' {
-      6      8
-      9      9
-   }
-}
-
-class 'pkg/TestInnerLocalPkg' {
-   method 'testStaticMethod ()V' {
-      4      12
-      e      13
-      18      14
-      1e      15
-   }
-
-   method 'testMethod ()V' {
-      5      26
-      f      27
-      1a      28
-      24      29
-      2a      30
-   }
-}
-
-class 'pkg/TestInnerLocalPkg$2Inner' {
-   method '<init> (Lpkg/TestInnerLocalPkg;Ljava/lang/String;)V' {
-      b      22
-      e      23
-   }
-}
-
-class 'pkg/TestInnerLocalPkg$Inner1Static' {
-   method '<init> (Ljava/lang/String;)V' {
-      6      36
-      9      37
-   }
-}
-
-class 'pkg/TestInnerLocalPkg$Inner1Static$Inner2Static' {
-   method '<init> (Ljava/lang/String;)V' {
-      6      43
-      9      44
-   }
-}
-
-class 'pkg/TestInnerLocalPkg$Inner1' {
-   method '<init> (Lpkg/TestInnerLocalPkg;Ljava/lang/String;)V' {
-      b      52
-      e      53
-   }
-}
-
-Lines mapping:
-24 <-> 9
-25 <-> 10
-27 <-> 13
-28 <-> 14
-29 <-> 15
-30 <-> 16
-36 <-> 23
-37 <-> 24
-39 <-> 27
-40 <-> 28
-41 <-> 29
-42 <-> 30
-43 <-> 31
-48 <-> 53
-49 <-> 54
-55 <-> 37
-56 <-> 38
-61 <-> 44
-62 <-> 45
-Not mapped:
-23
-35
-47
-54
-60
diff --git a/testData/results/TestInnerSignature.dec b/testData/results/TestInnerSignature.dec
index 3087a40..b2e4d0f 100644
--- a/testData/results/TestInnerSignature.dec
+++ b/testData/results/TestInnerSignature.dec
@@ -1,24 +1,26 @@
+package pkg;
+
 public class TestInnerSignature<A, B, C> {
    A a;
    B b;
    C c;
 
-   public TestInnerSignature(A var1, B var2, C var3) {
-      this.a = var1;// 23
-      this.b = var2;// 24
-      this.c = var3;// 25
-   }// 26
+   public TestInnerSignature(A a, @Deprecated B b, C c) {
+      this.a = a;// 9
+      this.b = b;// 10
+      this.c = c;// 11
+   }// 12
 
    public static class InnerStatic<A, B, C> {
       A a;
       B b;
       C c;
 
-      public InnerStatic(A var1, B var2, C var3) {
-         this.a = var1;// 46
-         this.b = var2;// 47
-         this.c = var3;// 48
-      }// 49
+      public InnerStatic(A a, @Deprecated B b, C c) {
+         this.a = a;// 32
+         this.b = b;// 33
+         this.c = c;// 34
+      }// 35
    }
 
    public class Inner {
@@ -26,55 +28,55 @@ public class TestInnerSignature<A, B, C> {
       B b;
       C c;
 
-      public Inner(A var1, B var2, C var3) {
-         this.a = var2;// 34
-         this.b = var3;// 35
-         this.c = var4;// 36
-      }// 37
+      public Inner(A a, @Deprecated B b, C c) {
+         this.a = a;// 20
+         this.b = b;// 21
+         this.c = c;// 22
+      }// 23
    }
 }
 
-class 'TestInnerSignature' {
+class 'pkg/TestInnerSignature' {
    method '<init> (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
-      6      6
-      b      7
-      10      8
-      13      9
+      6      8
+      b      9
+      10      10
+      13      11
    }
 }
 
-class 'TestInnerSignature$InnerStatic' {
+class 'pkg/TestInnerSignature$InnerStatic' {
    method '<init> (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
-      6      17
-      b      18
-      10      19
-      13      20
+      6      19
+      b      20
+      10      21
+      13      22
    }
 }
 
-class 'TestInnerSignature$Inner' {
-   method '<init> (LTestInnerSignature;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
-      b      29
-      10      30
-      16      31
-      19      32
+class 'pkg/TestInnerSignature$Inner' {
+   method '<init> (Lpkg/TestInnerSignature;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' {
+      b      31
+      10      32
+      16      33
+      19      34
    }
 }
 
 Lines mapping:
-23 <-> 7
-24 <-> 8
-25 <-> 9
-26 <-> 10
-34 <-> 30
-35 <-> 31
-36 <-> 32
-37 <-> 33
-46 <-> 18
-47 <-> 19
-48 <-> 20
-49 <-> 21
+9 <-> 9
+10 <-> 10
+11 <-> 11
+12 <-> 12
+20 <-> 32
+21 <-> 33
+22 <-> 34
+23 <-> 35
+32 <-> 20
+33 <-> 21
+34 <-> 22
+35 <-> 23
 Not mapped:
-22
-33
-45
+8
+19
+31
diff --git a/testData/results/TestInterfaceFields.dec b/testData/results/TestInterfaceFields.dec
new file mode 100644
index 0000000..d08e2fe
--- /dev/null
+++ b/testData/results/TestInterfaceFields.dec
@@ -0,0 +1,9 @@
+package pkg;
+
+import java.math.BigDecimal;
+
+public interface TestInterfaceFields {
+   BigDecimal BIG_ZERO = BigDecimal.ZERO;
+   int MAX_BYTE_VALUE = 127;
+}
+
diff --git a/testData/results/TestInterfaceMethods.dec b/testData/results/TestInterfaceMethods.dec
new file mode 100644
index 0000000..d27a839
--- /dev/null
+++ b/testData/results/TestInterfaceMethods.dec
@@ -0,0 +1,23 @@
+package pkg;
+
+public interface TestInterfaceMethods {
+   static void staticMethod() {
+   }// 4
+
+   default void defaultMethod() {
+   }// 5
+}
+
+class 'pkg/TestInterfaceMethods' {
+   method 'staticMethod ()V' {
+      0      4
+   }
+
+   method 'defaultMethod ()V' {
+      0      7
+   }
+}
+
+Lines mapping:
+4 <-> 5
+5 <-> 8
diff --git a/testData/results/TestInterfaceSuper.dec b/testData/results/TestInterfaceSuper.dec
new file mode 100644
index 0000000..a5567e2
--- /dev/null
+++ b/testData/results/TestInterfaceSuper.dec
@@ -0,0 +1,30 @@
+package pkg;
+
+public interface TestInterfaceSuper {
+   default void defaultMethod() {
+   }// 4
+
+   public static class Impl implements TestInterfaceSuper {
+      public void defaultMethod() {
+         TestInterfaceSuper.super.defaultMethod();// 8
+      }// 9
+   }
+}
+
+class 'pkg/TestInterfaceSuper' {
+   method 'defaultMethod ()V' {
+      0      4
+   }
+}
+
+class 'pkg/TestInterfaceSuper$Impl' {
+   method 'defaultMethod ()V' {
+      1      8
+      4      9
+   }
+}
+
+Lines mapping:
+4 <-> 5
+8 <-> 9
+9 <-> 10
diff --git a/testData/results/TestJava11StringConcat.dec b/testData/results/TestJava11StringConcat.dec
new file mode 100644
index 0000000..68ab9c2
--- /dev/null
+++ b/testData/results/TestJava11StringConcat.dec
@@ -0,0 +1,27 @@
+package java11;
+
+public class TestJava11StringConcat {
+   public String test1(String var1, int var2) {
+      return var1 + var2;// 20
+   }
+
+   public String test2(String var1, int var2, Object var3) {
+      return "(" + var1 + "-" + var2 + "---" + var3 + ")";// 24
+   }
+}
+
+class 'java11/TestJava11StringConcat' {
+   method 'test1 (Ljava/lang/String;I)Ljava/lang/String;' {
+      2      4
+      7      4
+   }
+
+   method 'test2 (Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;' {
+      3      8
+      8      8
+   }
+}
+
+Lines mapping:
+20 <-> 5
+24 <-> 9
diff --git a/testData/results/TestJava9StringConcat.dec b/testData/results/TestJava9StringConcat.dec
new file mode 100644
index 0000000..389bb85
--- /dev/null
+++ b/testData/results/TestJava9StringConcat.dec
@@ -0,0 +1,27 @@
+package java9;
+
+public class TestJava9StringConcat {
+   public String test1(String var1, int var2) {
+      return var1 + var2;// 20
+   }
+
+   public String test2(String var1, int var2, Object var3) {
+      return "(" + var1 + "-" + var2 + "---" + var3 + ")";// 24
+   }
+}
+
+class 'java9/TestJava9StringConcat' {
+   method 'test1 (Ljava/lang/String;I)Ljava/lang/String;' {
+      2      4
+      7      4
+   }
+
+   method 'test2 (Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;' {
+      3      8
+      8      8
+   }
+}
+
+Lines mapping:
+20 <-> 5
+24 <-> 9
diff --git a/testData/results/TestKotlinConstructorKt.dec b/testData/results/TestKotlinConstructorKt.dec
new file mode 100644
index 0000000..d1e3f7b
--- /dev/null
+++ b/testData/results/TestKotlinConstructorKt.dec
@@ -0,0 +1,75 @@
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import kotlin.Metadata;
+import kotlin.TypeCastException;
+import kotlin.collections.CollectionsKt;
+
+@Metadata(
+   mv = {1, 1, 1},
+   bv = {1, 0, 0},
+   k = 2,
+   d1 = {"\u0000\u0016\n\u0000\n\u0002\u0010 \n\u0002\u0018\u0002\n\u0000\n\u0002\u0010\u001e\n\u0002\u0010\u000e\n\u0000\u001a\u001c\u0010\u0000\u001a\b\u0012\u0004\u0012\u00020\u00020\u00012\f\u0010\u0003\u001a\b\u0012\u0004\u0012\u00020\u00050\u0004H\u0002¨\u0006\u0006"},
+   d2 = {"foo", "", "LMapping;", "list", "", "", "module1"}
+)
+public final class TestKotlinConstructorKt {
+   private static final List<Mapping> foo(Collection<String> list) {
+      Iterable $receiver$iv = (Iterable)list;// 2
+      Collection destination$iv$iv = (Collection)(new ArrayList(CollectionsKt.collectionSizeOrDefault($receiver$iv, 10)));// 10
+      Iterator var4 = $receiver$iv.iterator();// 11
+
+      while(var4.hasNext()) {
+         Object item$iv$iv = var4.next();
+         String it = (String)item$iv$iv;// 12
+         Mapping var10000 = new Mapping;
+         if (it == null) {// 3
+            throw new TypeCastException("null cannot be cast to non-null type kotlin.String");
+         }
+
+         var10000.<init>((String)it);
+         Mapping var11 = var10000;
+         destination$iv$iv.add(var11);
+      }
+
+      return CollectionsKt.toList((Iterable)((List)destination$iv$iv));// 4 13
+   }
+}
+
+class 'TestKotlinConstructorKt' {
+   method 'foo (Ljava/util/Collection;)Ljava/util/List;' {
+      1      17
+      4      17
+      d      18
+      f      18
+      15      18
+      18      18
+      1b      19
+      20      19
+      24      21
+      2e      22
+      33      22
+      38      23
+      3b      23
+      46      25
+      4d      26
+      52      26
+      53      29
+      56      29
+      59      30
+      5f      31
+      69      34
+      6c      34
+      6f      34
+      72      34
+   }
+}
+
+Lines mapping:
+2 <-> 18
+3 <-> 26
+4 <-> 35
+10 <-> 19
+11 <-> 20
+12 <-> 24
+13 <-> 35
diff --git a/testData/results/TestLambdaParams.dec b/testData/results/TestLambdaParams.dec
new file mode 100644
index 0000000..0048941
--- /dev/null
+++ b/testData/results/TestLambdaParams.dec
@@ -0,0 +1,48 @@
+package pkg;
+
+import java.util.function.Function;
+
+public class TestLambdaParams {
+   public static void toCollection(Object var0) {
+      Object var1 = null;// 23
+      Function var2 = (var1x) -> {
+         return var0;
+      };// 24
+      Function var3 = (var1x) -> {
+         return var1;
+      };// 25
+      Function var4 = (var0x) -> {
+         return var0x;
+      };// 26
+   }// 27
+}
+
+class 'pkg/TestLambdaParams' {
+   method 'lambda$toCollection$0 (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;' {
+      1      8
+   }
+
+   method 'lambda$toCollection$1 (Ljava/lang/Class;Ljava/lang/Object;)Ljava/lang/Object;' {
+      1      11
+   }
+
+   method 'lambda$toCollection$2 (Ljava/lang/Object;)Ljava/lang/Object;' {
+      1      14
+   }
+
+   method 'toCollection (Ljava/lang/Object;)V' {
+      0      6
+      1      6
+      8      9
+      f      12
+      15      15
+      17      16
+   }
+}
+
+Lines mapping:
+23 <-> 7
+24 <-> 10
+25 <-> 13
+26 <-> 16
+27 <-> 17
diff --git a/testData/results/TestLineNumbersMatch.dec b/testData/results/TestLineNumbersMatch.dec
deleted file mode 100644
index 9ab7626..0000000
--- a/testData/results/TestLineNumbersMatch.dec
+++ /dev/null
@@ -1,22 +0,0 @@
-package pkg;
-
-class TestLineNumbersMatch {
-
-
-
-   void m1(boolean b) {
-      if(b) {
-         System.out.println("a");
-      } else {
-         System.out.println("b");
-      }   }
-
-   void m2() {
-      (new Runnable() {
-
-         public void run() {
-            System.out.println("run with me");
-         }
-      }).run();
-   }
-}
diff --git a/testData/results/TestLocalClass.dec b/testData/results/TestLocalClass.dec
index 27c2958..a14a51a 100644
--- a/testData/results/TestLocalClass.dec
+++ b/testData/results/TestLocalClass.dec
@@ -3,6 +3,7 @@ package pkg;
 public abstract class TestLocalClass {
    void foo() {
       boolean var1 = true;// 8
+
       class Local {
          void foo() {
             boolean var1 = true;// 11
@@ -25,11 +26,11 @@ public abstract class TestLocalClass {
 
 class 'pkg/TestLocalClass$1Local' {
    method 'foo ()V' {
-      0      7
-      1      7
-      2      8
-      3      8
-      4      9
+      0      8
+      1      8
+      2      9
+      3      9
+      4      10
    }
 }
 
@@ -37,33 +38,33 @@ class 'pkg/TestLocalClass' {
    method 'foo ()V' {
       0      4
       1      4
-      a      12
-      c      13
-      f      14
+      a      13
+      c      14
+      f      15
    }
 
    method 'boo ()V' {
-      0      17
-      1      17
-      2      18
+      0      18
+      1      18
+      2      19
    }
 
    method 'zoo ()V' {
-      0      21
-      1      21
-      2      22
+      0      22
+      1      22
+      2      23
    }
 }
 
 Lines mapping:
 8 <-> 5
-11 <-> 8
-12 <-> 9
-13 <-> 10
-15 <-> 13
-16 <-> 14
-17 <-> 15
-20 <-> 18
-21 <-> 19
-24 <-> 22
-25 <-> 23
+11 <-> 9
+12 <-> 10
+13 <-> 11
+15 <-> 14
+16 <-> 15
+17 <-> 16
+20 <-> 19
+21 <-> 20
+24 <-> 23
+25 <-> 24
diff --git a/testData/results/TestLocalsNames.dec b/testData/results/TestLocalsNames.dec
new file mode 100644
index 0000000..fe6fe79
--- /dev/null
+++ b/testData/results/TestLocalsNames.dec
@@ -0,0 +1,77 @@
+package pkg;
+
+import java.io.File;
+
+public class TestLocalsNames {
+   private static void rename(File file, boolean recursively) {
+      if (file.isDirectory()) {// 22
+         long start = System.currentTimeMillis();// 23
+         File[] files = file.listFiles();// 25
+         File[] var5 = files;
+         int var6 = files.length;
+
+         for(int var7 = 0; var7 < var6; ++var7) {// 26
+            File s = var5[var7];
+            File dest = new File(s.getAbsolutePath() + ".tmp");// 27
+
+            assert s.renameTo(dest) : "unable to rename " + s + " to " + dest;// 28
+         }
+
+         long elapsed = System.currentTimeMillis() - start;// 31
+         System.out.println("took " + elapsed + "ms (" + elapsed / (long)files.length + "ms per dir)");// 32
+      }
+
+   }// 34
+}
+
+class 'pkg/TestLocalsNames' {
+   method 'rename (Ljava/io/File;Z)V' {
+      1      6
+      4      6
+      7      7
+      a      7
+      c      8
+      f      8
+      13      9
+      17      10
+      18      10
+      1a      12
+      1b      12
+      21      12
+      28      13
+      29      13
+      38      14
+      3e      14
+      43      14
+      49      14
+      55      16
+      66      16
+      70      16
+      7a      16
+      81      12
+      87      19
+      8b      19
+      8c      19
+      8e      20
+      98      20
+      a2      20
+      ab      20
+      ac      20
+      ad      20
+      b1      20
+      b6      20
+      b9      20
+      bc      23
+   }
+}
+
+Lines mapping:
+22 <-> 7
+23 <-> 8
+25 <-> 9
+26 <-> 13
+27 <-> 15
+28 <-> 17
+31 <-> 20
+32 <-> 21
+34 <-> 24
diff --git a/testData/results/TestLocalsSignature.dec b/testData/results/TestLocalsSignature.dec
new file mode 100644
index 0000000..2948bfd
--- /dev/null
+++ b/testData/results/TestLocalsSignature.dec
@@ -0,0 +1,25 @@
+package pkg;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestLocalsSignature {
+   public static void main(String[] args) {
+      List<String> s = new ArrayList();// 24
+      s.add("xxx");// 25
+   }// 26
+}
+
+class 'pkg/TestLocalsSignature' {
+   method 'main ([Ljava/lang/String;)V' {
+      7      7
+      9      8
+      b      8
+      11      9
+   }
+}
+
+Lines mapping:
+24 <-> 8
+25 <-> 9
+26 <-> 10
diff --git a/testData/results/TestMemberAnnotations.dec b/testData/results/TestMemberAnnotations.dec
new file mode 100644
index 0000000..1e3a41c
--- /dev/null
+++ b/testData/results/TestMemberAnnotations.dec
@@ -0,0 +1,34 @@
+package pkg;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+class TestMemberAnnotations {
+   @TestMemberAnnotations.A("const")
+   public static final int CONST = 42;
+   @TestMemberAnnotations.A("field")
+   private int f;
+
+   @TestMemberAnnotations.A("return")
+   private int f(@TestMemberAnnotations.A("arg") int var1) {
+      return var1 + this.f + 42;// 12
+   }
+
+   @Retention(RetentionPolicy.RUNTIME)
+   @interface A {
+      String value() default "";
+   }
+}
+
+class 'pkg/TestMemberAnnotations' {
+   method 'f (I)I' {
+      2      13
+      5      13
+      6      13
+      8      13
+      9      13
+   }
+}
+
+Lines mapping:
+12 <-> 14
diff --git a/testData/results/TestMethodParametersAttr.dec b/testData/results/TestMethodParametersAttr.dec
new file mode 100644
index 0000000..a48380b
--- /dev/null
+++ b/testData/results/TestMethodParametersAttr.dec
@@ -0,0 +1,125 @@
+package decompiler;
+
+public class TestMethodParametersAttr {
+   TestMethodParametersAttr(int p01) {
+   }// 19
+
+   void m1(int p02) {
+   }// 20
+
+   static void m2(int p03) {
+   }// 21
+
+   void local() {
+      class Local {
+         Local(int p31) {
+         }// 36
+
+         void m(int p32) {
+         }// 37
+      }
+
+   }// 39
+
+   abstract static class C4 {
+      abstract void m1(int p51);
+
+      abstract void m2(final int p52);
+   }
+
+   abstract class C3 {
+      abstract void m1(int p51);
+
+      abstract void m2(final int p52);
+   }
+
+   interface I1 {
+      void m1(int p41);
+
+      void m2(final int p42);
+   }
+
+   static class C2 {
+      C2(int p21) {
+      }// 29
+
+      void m1(int p22) {
+      }// 30
+
+      static void m2(int p23) {
+      }// 31
+   }
+
+   class C1 {
+      C1(int p11) {
+      }// 24
+
+      void m(int p12) {
+      }// 25
+   }
+}
+
+class 'decompiler/TestMethodParametersAttr' {
+   method '<init> (I)V' {
+      4      4
+   }
+
+   method 'm1 (I)V' {
+      0      7
+   }
+
+   method 'm2 (I)V' {
+      0      10
+   }
+
+   method 'local ()V' {
+      0      21
+   }
+}
+
+class 'decompiler/TestMethodParametersAttr$1Local' {
+   method '<init> (Ldecompiler/TestMethodParametersAttr;I)V' {
+      9      15
+   }
+
+   method 'm (I)V' {
+      0      18
+   }
+}
+
+class 'decompiler/TestMethodParametersAttr$C2' {
+   method '<init> (I)V' {
+      4      43
+   }
+
+   method 'm1 (I)V' {
+      0      46
+   }
+
+   method 'm2 (I)V' {
+      0      49
+   }
+}
+
+class 'decompiler/TestMethodParametersAttr$C1' {
+   method '<init> (Ldecompiler/TestMethodParametersAttr;I)V' {
+      9      54
+   }
+
+   method 'm (I)V' {
+      0      57
+   }
+}
+
+Lines mapping:
+19 <-> 5
+20 <-> 8
+21 <-> 11
+24 <-> 55
+25 <-> 58
+29 <-> 44
+30 <-> 47
+31 <-> 50
+36 <-> 16
+37 <-> 19
+39 <-> 22
diff --git a/testData/results/TestMethodReferenceLetterClass.dec b/testData/results/TestMethodReferenceLetterClass.dec
new file mode 100644
index 0000000..0491efa
--- /dev/null
+++ b/testData/results/TestMethodReferenceLetterClass.dec
@@ -0,0 +1,18 @@
+import java.util.function.Consumer;
+
+public class TestMethodReferenceLetterClass {
+   void boo() {
+      Consumer var1 = R::foo;// 21
+   }// 22
+}
+
+class 'TestMethodReferenceLetterClass' {
+   method 'boo ()V' {
+      5      4
+      6      5
+   }
+}
+
+Lines mapping:
+21 <-> 5
+22 <-> 6
diff --git a/testData/results/TestMethodReferenceSameName.dec b/testData/results/TestMethodReferenceSameName.dec
new file mode 100644
index 0000000..2592d18
--- /dev/null
+++ b/testData/results/TestMethodReferenceSameName.dec
@@ -0,0 +1,32 @@
+public class TestMethodReferenceSameName {
+   TestMethodReferenceSameName.R1 r;
+
+   private void foo() {
+      TestMethodReferenceSameName.R1 var10000 = this.r;// 5
+      (var10000::foo).run();
+   }// 6
+
+   class R1 {
+      void foo() {
+      }// 9
+   }
+}
+
+class 'TestMethodReferenceSameName' {
+   method 'foo ()V' {
+      1      4
+      e      5
+      13      6
+   }
+}
+
+class 'TestMethodReferenceSameName$R1' {
+   method 'foo ()V' {
+      0      10
+   }
+}
+
+Lines mapping:
+5 <-> 5
+6 <-> 7
+9 <-> 11
diff --git a/testData/results/TestMissingConstructorCallBad.dec b/testData/results/TestMissingConstructorCallBad.dec
new file mode 100644
index 0000000..c4bec2b
--- /dev/null
+++ b/testData/results/TestMissingConstructorCallBad.dec
@@ -0,0 +1,49 @@
+package pkg;
+
+public class TestMissingConstructorCallBad {
+   private TestMissingConstructorCallBad() {
+      System.out.println("Nobody will see what we do here!");// 14 15 16
+      this((Object)null);// 19 20
+   }// 21
+
+   public static void main(String... var0) {
+      try {
+         new TestMissingConstructorCallBad();
+      } catch (Throwable var2) {// 37
+      }
+
+   }// 39
+}
+
+class 'pkg/TestMissingConstructorCallBad' {
+   method '<init> ()V' {
+      0      4
+      3      4
+      5      4
+      9      5
+      a      5
+      d      6
+   }
+
+   method 'main ([Ljava/lang/String;)V' {
+      b      11
+      c      14
+   }
+}
+
+Lines mapping:
+14 <-> 5
+15 <-> 5
+16 <-> 5
+19 <-> 6
+20 <-> 6
+21 <-> 7
+37 <-> 12
+39 <-> 15
+Not mapped:
+18
+28
+29
+30
+31
+33
diff --git a/testData/results/TestMissingConstructorCallGood.dec b/testData/results/TestMissingConstructorCallGood.dec
new file mode 100644
index 0000000..2173f97
--- /dev/null
+++ b/testData/results/TestMissingConstructorCallGood.dec
@@ -0,0 +1,59 @@
+package pkg;
+
+public class TestMissingConstructorCallGood {
+   private TestMissingConstructorCallGood(Object var1) {
+   }// 16
+
+   private TestMissingConstructorCallGood() {
+      System.out.println("Nobody will see what we do here!");// 22 23 24
+      this((Object)null);// 27 28
+   }// 29
+
+   public static void main(String... var0) {
+      try {
+         new TestMissingConstructorCallGood();
+      } catch (Throwable var2) {// 45
+      }
+
+   }// 47
+}
+
+class 'pkg/TestMissingConstructorCallGood' {
+   method '<init> (Ljava/lang/Object;)V' {
+      4      4
+   }
+
+   method '<init> ()V' {
+      0      7
+      3      7
+      5      7
+      9      8
+      a      8
+      d      9
+   }
+
+   method 'main ([Ljava/lang/String;)V' {
+      b      14
+      c      17
+   }
+}
+
+Lines mapping:
+16 <-> 5
+22 <-> 8
+23 <-> 8
+24 <-> 8
+27 <-> 9
+28 <-> 9
+29 <-> 10
+45 <-> 15
+47 <-> 18
+Not mapped:
+14
+15
+26
+36
+37
+38
+39
+41
diff --git a/testData/results/TestNamedSuspendFun2Kt.dec b/testData/results/TestNamedSuspendFun2Kt.dec
new file mode 100644
index 0000000..8c4d7c5
--- /dev/null
+++ b/testData/results/TestNamedSuspendFun2Kt.dec
@@ -0,0 +1,301 @@
+import kotlin.Metadata;
+import kotlin.SuccessOrFailure.Failure;
+import kotlin.coroutines.Continuation;
+import kotlin.coroutines.intrinsics.IntrinsicsKt;
+import kotlin.coroutines.jvm.internal.ContinuationImpl;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+@Metadata(
+   mv = {1, 1, 11},
+   bv = {1, 0, 2},
+   k = 2,
+   xi = 2,
+   d1 = {"\u0000\n\n\u0000\n\u0002\u0010\b\n\u0002\b\u0002\u001a\u0011\u0010\u0000\u001a\u00020\u0001H\u0086@ø\u0001\u0000¢\u0006\u0002\u0010\u0002\u001a\u0011\u0010\u0003\u001a\u00020\u0001H\u0086@ø\u0001\u0000¢\u0006\u0002\u0010\u0002\u0082\u0002\u0004\n\u0002\b\u0019"},
+   d2 = {"bar", "", "(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;", "foo2"}
+)
+public final class TestNamedSuspendFun2Kt {
+   @Nullable
+   public static final Object foo2(@NotNull Continuation<? super Integer> var0) {
+      @Metadata(
+         mv = {1, 1, 11},
+         bv = {1, 0, 2},
+         k = 3,
+         xi = 2,
+         d1 = {"\u0000\u0010\n\u0000\n\u0002\u0010\u0000\n\u0000\n\u0002\u0018\u0002\n\u0002\u0010\b\u0010\u0000\u001a\u0004\u0018\u00010\u00012\f\u0010\u0002\u001a\b\u0012\u0004\u0012\u00020\u00040\u0003H\u0086@ø\u0001\u0000"},
+         d2 = {"foo2", "", "continuation", "Lkotlin/coroutines/Continuation;", ""}
+      )
+      final class NamelessClass_1 extends ContinuationImpl {
+         int label;
+         int I$0;
+         Object L$0;
+
+         @Nullable
+         public final Object invokeSuspend(@NotNull Object result) {
+            this.data = result;
+            this.label |= -2147483648;
+            return TestNamedSuspendFun2Kt.foo2(this);
+         }
+
+         NamelessClass_1(Continuation var1) {
+            super(var1);
+         }
+      }
+
+      NamelessClass_1 var3;
+      label463: {
+         if (var0 instanceof NamelessClass_1) {
+            var3 = (NamelessClass_1)var0;
+            if ((var3.getLabel() & -2147483648) != 0) {
+               var3.setLabel(var3.getLabel() - -2147483648);
+               break label463;
+            }
+         }
+
+         var3 = new NamelessClass_1(var0);
+      }
+
+      Object var4;
+      int x;
+      label491: {
+         Throwable var1;
+         Throwable var10000;
+         label472: {
+            Object var2 = var3.data;
+            var4 = IntrinsicsKt.getCOROUTINE_SUSPENDED();// 2
+            boolean var10001;
+            Object var22;
+            switch(var3.label) {
+            case 0:
+               if (var2 instanceof Failure) {
+                  throw ((Failure)var2).exception;
+               }
+               break;
+            case 1:
+               try {
+                  if (var2 instanceof Failure) {
+                     throw ((Failure)var2).exception;
+                  }
+
+                  var22 = var2;
+               } catch (Throwable var19) {
+                  var10000 = var19;
+                  var10001 = false;
+                  break label472;
+               }
+
+               try {
+                  x = ((Number)var22).intValue();// 6
+                  if (x == 0) {
+                     break label491;
+                  }
+               } catch (Throwable var17) {
+                  var10000 = var17;
+                  var10001 = false;
+                  break label472;
+               }
+
+               var3.label = 3;
+               if (bar(var3) == var4) {
+                  return var4;
+               }
+               break;
+            case 2:
+               x = var3.I$0;
+               if (var2 instanceof Failure) {
+                  throw ((Failure)var2).exception;
+               }
+
+               return 1;// 11
+            case 3:
+               if (var2 instanceof Failure) {
+                  throw ((Failure)var2).exception;
+               }
+               break;
+            case 4:
+               var1 = (Throwable)var3.L$0;
+               if (var2 instanceof Failure) {
+                  throw ((Failure)var2).exception;
+               }
+
+               throw var1;// 9
+            default:
+               throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine");
+            }
+
+            do {
+               try {
+                  var3.label = 1;// 5
+                  var22 = bar(var3);
+               } catch (Throwable var18) {
+                  var10000 = var18;
+                  var10001 = false;
+                  break label472;
+               }
+
+               if (var22 == var4) {
+                  return var4;
+               }
+
+               try {
+                  x = ((Number)var22).intValue();
+                  if (x == 0) {
+                     break label491;
+                  }
+               } catch (Throwable var20) {
+                  var10000 = var20;
+                  var10001 = false;
+                  break label472;
+               }
+
+               var3.label = 3;
+            } while(bar(var3) != var4);
+
+            return var4;
+         }
+
+         var1 = var10000;
+         var3.L$0 = var1;
+         var3.label = 4;
+         if (bar(var3) == var4) {// 8
+            return var4;
+         }
+
+         throw var1;
+      }
+
+      var3.I$0 = x;
+      var3.label = 2;
+      if (bar(var3) == var4) {
+         return var4;
+      } else {
+         return 1;
+      }
+   }
+
+   @Nullable
+   public static final Object bar(@NotNull Continuation<? super Integer> var0) {
+      return 0;// 14
+   }
+}
+
+class 'TestNamedSuspendFun2Kt$foo2$1' {
+   method 'invokeSuspend (Ljava/lang/Object;)Ljava/lang/Object;' {
+      2      34
+      a      35
+      d      35
+      11      36
+      14      36
+   }
+
+   method '<init> (Lkotlin/coroutines/Continuation;)V' {
+      2      40
+      5      41
+   }
+}
+
+class 'TestNamedSuspendFun2Kt' {
+   method 'foo2 (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;' {
+      1      46
+      4      46
+      8      47
+      b      47
+      d      48
+      10      48
+      12      48
+      13      48
+      18      49
+      1b      49
+      1d      49
+      1e      49
+      21      50
+      2c      54
+      2e      63
+      31      63
+      32      64
+      35      64
+      38      67
+      3b      67
+      5e      69
+      61      69
+      64      70
+      67      70
+      6a      70
+      6f      127
+      70      127
+      73      128
+      79      135
+      7e      136
+      81      75
+      84      75
+      87      76
+      8a      76
+      8d      76
+      90      87
+      93      87
+      96      87
+      98      88
+      9e      166
+      a2      167
+      a3      167
+      a6      168
+      ac      168
+      b1      169
+      b3      103
+      b6      103
+      b9      104
+      bc      104
+      bf      105
+      c2      105
+      c5      105
+      c9      108
+      ce      97
+      cf      97
+      d2      98
+      d8      98
+      dd      99
+      e0      110
+      e3      110
+      e6      111
+      e9      111
+      ec      111
+      f3      156
+      f7      157
+      fb      158
+      fc      158
+      ff      159
+      105      159
+      10a      160
+      10c      115
+      10f      115
+      112      115
+      115      116
+      118      116
+      11b      117
+      11e      117
+      121      117
+      126      120
+      12a      108
+      12b      108
+      133      122
+      138      122
+   }
+
+   method 'bar (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;' {
+      0      177
+      1      177
+      4      177
+   }
+}
+
+Lines mapping:
+2 <-> 65
+5 <-> 128
+6 <-> 88
+8 <-> 160
+9 <-> 121
+11 <-> 109
+14 <-> 178
+Not mapped:
+3
+4
diff --git a/testData/results/TestParameterizedTypes.dec b/testData/results/TestParameterizedTypes.dec
new file mode 100644
index 0000000..862ba54
--- /dev/null
+++ b/testData/results/TestParameterizedTypes.dec
@@ -0,0 +1,11 @@
+package pkg;
+
+public abstract class TestParameterizedTypes<P> {
+   abstract TestParameterizedTypes<P>.Inner<String> getUnspecificInner();
+
+   abstract TestParameterizedTypes<Number>.Inner<String> getSpecificInner();
+
+   public abstract class Inner<I> {
+   }
+}
+
diff --git a/testData/results/TestPop2OneDoublePop2.dec b/testData/results/TestPop2OneDoublePop2.dec
new file mode 100644
index 0000000..95ceaee
--- /dev/null
+++ b/testData/results/TestPop2OneDoublePop2.dec
@@ -0,0 +1,27 @@
+package pkg;
+
+public class TestPop2OneDoublePop2 {
+   public static void main(String... var0) {
+      double var10002 = 3.14159265358D;// 24
+      System.out.println(1234567890);// 22 23 26
+   }// 27
+}
+
+class 'pkg/TestPop2OneDoublePop2' {
+   method 'main ([Ljava/lang/String;)V' {
+      0      5
+      3      5
+      5      4
+      9      5
+      c      6
+   }
+}
+
+Lines mapping:
+22 <-> 6
+23 <-> 6
+24 <-> 5
+26 <-> 6
+27 <-> 7
+Not mapped:
+25
diff --git a/testData/results/TestPop2OneLongPop2.dec b/testData/results/TestPop2OneLongPop2.dec
new file mode 100644
index 0000000..2d78133
--- /dev/null
+++ b/testData/results/TestPop2OneLongPop2.dec
@@ -0,0 +1,27 @@
+package pkg;
+
+public class TestPop2OneLongPop2 {
+   public static void main(String... var0) {
+      long var10002 = -889275714L;// 24
+      System.out.println(1234567890);// 22 23 26
+   }// 27
+}
+
+class 'pkg/TestPop2OneLongPop2' {
+   method 'main ([Ljava/lang/String;)V' {
+      0      5
+      3      5
+      5      4
+      9      5
+      c      6
+   }
+}
+
+Lines mapping:
+22 <-> 6
+23 <-> 6
+24 <-> 5
+26 <-> 6
+27 <-> 7
+Not mapped:
+25
diff --git a/testData/results/TestPop2TwoIntPop2.dec b/testData/results/TestPop2TwoIntPop2.dec
new file mode 100644
index 0000000..9d1583c
--- /dev/null
+++ b/testData/results/TestPop2TwoIntPop2.dec
@@ -0,0 +1,30 @@
+package pkg;
+
+public class TestPop2TwoIntPop2 {
+   public static void main(String... var0) {
+      char var10002 = '쫾';// 24
+      char var10003 = '몾';// 25
+      System.out.println(1234567890);// 22 23 27
+   }// 28
+}
+
+class 'pkg/TestPop2TwoIntPop2' {
+   method 'main ([Ljava/lang/String;)V' {
+      0      6
+      3      6
+      5      4
+      7      5
+      a      6
+      d      7
+   }
+}
+
+Lines mapping:
+22 <-> 7
+23 <-> 7
+24 <-> 5
+25 <-> 6
+27 <-> 7
+28 <-> 8
+Not mapped:
+26
diff --git a/testData/results/TestPop2TwoIntTwoPop.dec b/testData/results/TestPop2TwoIntTwoPop.dec
new file mode 100644
index 0000000..aaa360b
--- /dev/null
+++ b/testData/results/TestPop2TwoIntTwoPop.dec
@@ -0,0 +1,31 @@
+package pkg;
+
+public class TestPop2TwoIntTwoPop {
+   public static void main(String... var0) {
+      char var10002 = '쫾';// 24
+      char var10003 = '몾';// 25
+      System.out.println(1234567890);// 22 23 28
+   }// 29
+}
+
+class 'pkg/TestPop2TwoIntTwoPop' {
+   method 'main ([Ljava/lang/String;)V' {
+      0      6
+      3      6
+      5      4
+      7      5
+      b      6
+      e      7
+   }
+}
+
+Lines mapping:
+22 <-> 7
+23 <-> 7
+24 <-> 5
+25 <-> 6
+28 <-> 7
+29 <-> 8
+Not mapped:
+26
+27
diff --git a/testData/results/TestPrimitiveNarrowing.dec b/testData/results/TestPrimitiveNarrowing.dec
new file mode 100644
index 0000000..1e5d30c
--- /dev/null
+++ b/testData/results/TestPrimitiveNarrowing.dec
@@ -0,0 +1,64 @@
+package pkg;
+
+class TestPrimitiveNarrowing {
+   TestPrimitiveNarrowing(Short value) {
+   }// 6
+
+   static void invocations() {
+      withInteger((Integer)null);// 9
+      withShort((Short)null);// 10
+      withByte((Byte)null);// 11
+      new TestPrimitiveNarrowing((Short)null);// 12
+   }// 13
+
+   static void withByte(Byte defaultValue) {
+   }// 16
+
+   static void withInteger(Integer defaultValue) {
+   }// 19
+
+   static void withShort(Short defaultValue) {
+   }// 22
+}
+
+class 'pkg/TestPrimitiveNarrowing' {
+   method '<init> (Ljava/lang/Short;)V' {
+      4      4
+   }
+
+   method 'invocations ()V' {
+      0      7
+      1      7
+      4      8
+      5      8
+      8      9
+      9      9
+      10      10
+      15      11
+   }
+
+   method 'withByte (Ljava/lang/Byte;)V' {
+      0      14
+   }
+
+   method 'withInteger (Ljava/lang/Integer;)V' {
+      0      17
+   }
+
+   method 'withShort (Ljava/lang/Short;)V' {
+      0      20
+   }
+}
+
+Lines mapping:
+6 <-> 5
+9 <-> 8
+10 <-> 9
+11 <-> 10
+12 <-> 11
+13 <-> 12
+16 <-> 15
+19 <-> 18
+22 <-> 21
+Not mapped:
+5
diff --git a/testData/results/TestPrimitives.dec b/testData/results/TestPrimitives.dec
new file mode 100644
index 0000000..bc930a5
--- /dev/null
+++ b/testData/results/TestPrimitives.dec
@@ -0,0 +1,663 @@
+package pkg;
+
+import java.util.HashMap;
+
+public class TestPrimitives {
+   public void printAll() {
+      this.printBoolean(true);// 8
+      this.printByte((byte)123);// 9
+      this.printShort((short)257);// 10
+      this.printInt(123);// 11
+      this.printLong(123L);// 12
+      this.printFloat(1.23F);// 13
+      this.printDouble(1.23D);// 14
+      this.printChar('Z');// 15
+      this.printBooleanBoxed(true);// 17
+      this.printByteBoxed((byte)123);// 18
+      this.printShortBoxed((short)257);// 19
+      this.printIntBoxed(1);// 20
+      this.printIntBoxed(40000);// 21
+      this.printLongBoxed(123L);// 22
+      this.printFloatBoxed(1.23F);// 23
+      this.printDoubleBoxed(1.23D);// 24
+      this.printCharBoxed('Z');// 25
+      this.printBoolean(Boolean.valueOf("true"));// 27
+      this.printByte(Byte.valueOf("123"));// 28
+      this.printShort(Short.valueOf("257"));// 29
+      this.printInt(Integer.valueOf("123"));// 30
+      this.printLong(Long.valueOf("123"));// 31
+      this.printFloat(Float.valueOf("1.23"));// 32
+      this.printDouble(Double.valueOf("1.23"));// 33
+      this.printChar(new Character('Z'));// 34
+      this.printInt(this.getInteger());// 36
+      this.printChar(this.getCharacter());// 37
+      System.out.printf("%b, %d, %d, %d, %c, %d", true, 1, 213, 40000, 'c', 42L);// 39
+      System.out.printf("%b, %d, %d, %d", this.getBoolean(), this.getByte(), this.getShort(), this.getInt());// 40
+      new TestPrimitives(false, (byte)123, (short)257, 40000, 123L, 3.14F, 1.618D, 'A');// 42
+      new TestPrimitives('A', 1.618D, 3.14F, 123L, 40000, (short)257, (byte)123, false);// 43
+      new TestPrimitives(Boolean.valueOf("false"), Byte.valueOf("123"), Short.valueOf("257"), Integer.valueOf("40000"), Long.valueOf("123"), Float.valueOf("3.14"), Double.valueOf("1.618"), new Character('A'));// 44 45
+   }// 46
+
+   private TestPrimitives(boolean bool, byte b, short s, int i, long l, float f, double d, char c) {
+      System.out.printf("%b, %d, %d, %d, %d, %.2f, %.2f, %c", bool, b, s, i, l, f, d, c);// 49
+   }// 50
+
+   private TestPrimitives(Character c, Double d, Float f, Long l, Integer i, Short s, Byte b, Boolean bool) {
+      System.out.printf("%b, %d, %d, %d, %d, %.2f, %.2f, %c", bool, b, s, i, l, f, d, c);// 53
+   }// 54
+
+   public void printBoolean(boolean b) {
+      System.out.printf("%b", b);// 57
+   }// 58
+
+   public void printByte(byte b) {
+      System.out.printf("%d", b);// 61
+   }// 62
+
+   public void printShort(short s) {
+      System.out.printf("%d", s);// 65
+   }// 66
+
+   public void printInt(int i) {
+      System.out.printf("%d", i);// 69
+   }// 70
+
+   public void printLong(long l) {
+      System.out.printf("%d", l);// 73
+   }// 74
+
+   public void printFloat(float f) {
+      System.out.printf("%f", f);// 77
+   }// 78
+
+   public void printDouble(double d) {
+      System.out.printf("%f", d);// 81
+   }// 82
+
+   public void printChar(char c) {
+      System.out.printf("%c", c);// 85
+   }// 86
+
+   public void printBooleanBoxed(Boolean b) {
+      System.out.printf("%b", b);// 90
+   }// 91
+
+   public void printByteBoxed(Byte b) {
+      System.out.printf("%d", b);// 94
+   }// 95
+
+   public void printShortBoxed(Short s) {
+      System.out.printf("%d", s);// 98
+   }// 99
+
+   public void printIntBoxed(Integer i) {
+      System.out.printf("%d", i);// 102
+   }// 103
+
+   public void printLongBoxed(Long l) {
+      System.out.printf("%d", l);// 106
+   }// 107
+
+   public void printFloatBoxed(Float f) {
+      System.out.printf("%f", f);// 110
+   }// 111
+
+   public void printDoubleBoxed(Double d) {
+      System.out.printf("%f", d);// 114
+   }// 115
+
+   public void printCharBoxed(Character c) {
+      System.out.printf("%c", c);// 118
+   }// 119
+
+   public boolean getBoolean() {
+      return false;// 123
+   }
+
+   public byte getByte() {
+      return -128;// 127
+   }
+
+   public short getShort() {
+      return -32768;// 131
+   }
+
+   public int getInt() {
+      return 42;// 135
+   }
+
+   public Integer getInteger() {
+      return 40000;// 139
+   }
+
+   public Character getCharacter() {
+      return 'Z';// 143
+   }
+
+   public void printNarrowed() {
+      this.printByte((byte)this.getInt());// 147
+      this.printShort((short)this.getInt());// 148
+   }// 149
+
+   public void constructor() {
+      new Byte((byte)1);// 152
+   }// 153
+
+   private boolean compare(char c) {
+      boolean res = c > -1;// 156
+      res = c > 0;// 157
+      res = c > 1;// 158
+      res = c > '\b';// 159
+      res = c > '\t';// 160
+      res = c > '\n';// 161
+      res = c > '\f';// 162
+      res = c > '\r';// 163
+      res = c > ' ';// 164
+      res = c > 'a';// 165
+      res = c > 'Z';// 166
+      res = c > 127;// 167
+      res = c > 255;// 168
+      return res;// 169
+   }
+
+   void testAutoBoxingCallRequired(boolean value) {
+      Boolean.valueOf(value).hashCode();// 173
+   }// 174
+
+   void testCastRequired() {
+      HashMap<String, Byte> map = new HashMap();// 177
+      map.put("test", (byte)0);// 178
+   }// 179
+}
+
+class 'pkg/TestPrimitives' {
+   method 'printAll ()V' {
+      1      6
+      2      6
+      6      7
+      8      7
+      c      8
+      f      8
+      13      9
+      15      9
+      19      10
+      1c      10
+      20      11
+      22      11
+      26      12
+      29      12
+      2d      13
+      2f      13
+      33      14
+      37      14
+      3b      15
+      40      15
+      44      16
+      4a      16
+      4e      17
+      52      17
+      56      18
+      5b      18
+      5f      19
+      65      19
+      69      20
+      6e      20
+      72      21
+      78      21
+      7c      22
+      81      22
+      85      23
+      87      23
+      8a      23
+      8d      23
+      91      24
+      93      24
+      96      24
+      99      24
+      9d      25
+      9f      25
+      a2      25
+      a5      25
+      a9      26
+      ab      26
+      ae      26
+      b1      26
+      b5      27
+      b7      27
+      ba      27
+      bd      27
+      c1      28
+      c3      28
+      c6      28
+      c9      28
+      cd      29
+      cf      29
+      d2      29
+      d5      29
+      dd      30
+      e2      30
+      e5      30
+      ea      31
+      ed      31
+      f0      31
+      f5      32
+      f8      32
+      fb      32
+      fe      33
+      101      33
+      10a      33
+      10b      33
+      111      33
+      112      33
+      118      33
+      11b      33
+      121      33
+      123      33
+      129      33
+      12b      33
+      131      33
+      134      33
+      138      33
+      13c      34
+      13f      34
+      148      34
+      14b      34
+      152      34
+      155      34
+      15c      34
+      15f      34
+      166      34
+      169      34
+      16d      34
+      175      35
+      176      35
+      178      35
+      17b      35
+      17d      35
+      180      35
+      182      35
+      185      35
+      18f      36
+      194      36
+      19a      36
+      19f      36
+      1a5      36
+      1aa      36
+      1b0      36
+      1b5      36
+      1c1      37
+      1c3      37
+      1c6      37
+      1c9      37
+      1cb      37
+      1ce      37
+      1d1      37
+      1d3      37
+      1d6      37
+      1d9      37
+      1db      37
+      1de      37
+      1e1      37
+      1e3      37
+      1e6      37
+      1e9      37
+      1eb      37
+      1ee      37
+      1f1      37
+      1f3      37
+      1f6      37
+      1fd      37
+      202      37
+      209      38
+   }
+
+   method '<init> (ZBSIJFDC)V' {
+      4      41
+      7      41
+      11      41
+      18      41
+      1f      41
+      27      41
+      2f      41
+      37      41
+      40      41
+      49      41
+      4d      41
+      51      42
+   }
+
+   method '<init> (Ljava/lang/Character;Ljava/lang/Double;Ljava/lang/Float;Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Short;Ljava/lang/Byte;Ljava/lang/Boolean;)V' {
+      4      45
+      7      45
+      35      45
+      39      46
+   }
+
+   method 'printBoolean (Z)V' {
+      0      49
+      3      49
+      c      49
+      10      49
+      14      50
+   }
+
+   method 'printByte (B)V' {
+      0      53
+      3      53
+      c      53
+      10      53
+      14      54
+   }
+
+   method 'printShort (S)V' {
+      0      57
+      3      57
+      c      57
+      10      57
+      14      58
+   }
+
+   method 'printInt (I)V' {
+      0      61
+      3      61
+      c      61
+      10      61
+      14      62
+   }
+
+   method 'printLong (J)V' {
+      0      65
+      3      65
+      c      65
+      10      65
+      14      66
+   }
+
+   method 'printFloat (F)V' {
+      0      69
+      3      69
+      c      69
+      10      69
+      14      70
+   }
+
+   method 'printDouble (D)V' {
+      0      73
+      3      73
+      c      73
+      10      73
+      14      74
+   }
+
+   method 'printChar (C)V' {
+      0      77
+      3      77
+      c      77
+      10      77
+      14      78
+   }
+
+   method 'printBooleanBoxed (Ljava/lang/Boolean;)V' {
+      0      81
+      3      81
+      d      81
+      11      82
+   }
+
+   method 'printByteBoxed (Ljava/lang/Byte;)V' {
+      0      85
+      3      85
+      d      85
+      11      86
+   }
+
+   method 'printShortBoxed (Ljava/lang/Short;)V' {
+      0      89
+      3      89
+      d      89
+      11      90
+   }
+
+   method 'printIntBoxed (Ljava/lang/Integer;)V' {
+      0      93
+      3      93
+      d      93
+      11      94
+   }
+
+   method 'printLongBoxed (Ljava/lang/Long;)V' {
+      0      97
+      3      97
+      d      97
+      11      98
+   }
+
+   method 'printFloatBoxed (Ljava/lang/Float;)V' {
+      0      101
+      3      101
+      d      101
+      11      102
+   }
+
+   method 'printDoubleBoxed (Ljava/lang/Double;)V' {
+      0      105
+      3      105
+      d      105
+      11      106
+   }
+
+   method 'printCharBoxed (Ljava/lang/Character;)V' {
+      0      109
+      3      109
+      d      109
+      11      110
+   }
+
+   method 'getBoolean ()Z' {
+      0      113
+      1      113
+   }
+
+   method 'getByte ()B' {
+      0      117
+      2      117
+   }
+
+   method 'getShort ()S' {
+      0      121
+      3      121
+   }
+
+   method 'getInt ()I' {
+      0      125
+      2      125
+   }
+
+   method 'getInteger ()Ljava/lang/Integer;' {
+      0      129
+      2      129
+      5      129
+   }
+
+   method 'getCharacter ()Ljava/lang/Character;' {
+      0      133
+      2      133
+      5      133
+   }
+
+   method 'printNarrowed ()V' {
+      2      137
+      5      137
+      6      137
+      b      138
+      e      138
+      f      138
+      12      139
+   }
+
+   method 'constructor ()V' {
+      4      142
+      9      143
+   }
+
+   method 'compare (C)Z' {
+      1      146
+      2      146
+      a      146
+      c      147
+      14      147
+      16      148
+      17      148
+      1f      148
+      21      149
+      23      149
+      2b      149
+      2d      150
+      2f      150
+      37      150
+      39      151
+      3b      151
+      43      151
+      45      152
+      47      152
+      4f      152
+      51      153
+      53      153
+      5b      153
+      5d      154
+      5f      154
+      67      154
+      69      155
+      6b      155
+      73      155
+      75      156
+      77      156
+      7f      156
+      81      157
+      83      157
+      8b      157
+      8d      158
+      90      158
+      98      158
+      9a      159
+   }
+
+   method 'testAutoBoxingCallRequired (Z)V' {
+      1      163
+      4      163
+      8      164
+   }
+
+   method 'testCastRequired ()V' {
+      7      167
+      9      168
+      b      168
+      f      168
+      13      169
+   }
+}
+
+Lines mapping:
+8 <-> 7
+9 <-> 8
+10 <-> 9
+11 <-> 10
+12 <-> 11
+13 <-> 12
+14 <-> 13
+15 <-> 14
+17 <-> 15
+18 <-> 16
+19 <-> 17
+20 <-> 18
+21 <-> 19
+22 <-> 20
+23 <-> 21
+24 <-> 22
+25 <-> 23
+27 <-> 24
+28 <-> 25
+29 <-> 26
+30 <-> 27
+31 <-> 28
+32 <-> 29
+33 <-> 30
+34 <-> 31
+36 <-> 32
+37 <-> 33
+39 <-> 34
+40 <-> 35
+42 <-> 36
+43 <-> 37
+44 <-> 38
+45 <-> 38
+46 <-> 39
+49 <-> 42
+50 <-> 43
+53 <-> 46
+54 <-> 47
+57 <-> 50
+58 <-> 51
+61 <-> 54
+62 <-> 55
+65 <-> 58
+66 <-> 59
+69 <-> 62
+70 <-> 63
+73 <-> 66
+74 <-> 67
+77 <-> 70
+78 <-> 71
+81 <-> 74
+82 <-> 75
+85 <-> 78
+86 <-> 79
+90 <-> 82
+91 <-> 83
+94 <-> 86
+95 <-> 87
+98 <-> 90
+99 <-> 91
+102 <-> 94
+103 <-> 95
+106 <-> 98
+107 <-> 99
+110 <-> 102
+111 <-> 103
+114 <-> 106
+115 <-> 107
+118 <-> 110
+119 <-> 111
+123 <-> 114
+127 <-> 118
+131 <-> 122
+135 <-> 126
+139 <-> 130
+143 <-> 134
+147 <-> 138
+148 <-> 139
+149 <-> 140
+152 <-> 143
+153 <-> 144
+156 <-> 147
+157 <-> 148
+158 <-> 149
+159 <-> 150
+160 <-> 151
+161 <-> 152
+162 <-> 153
+163 <-> 154
+164 <-> 155
+165 <-> 156
+166 <-> 157
+167 <-> 158
+168 <-> 159
+169 <-> 160
+173 <-> 164
+174 <-> 165
+177 <-> 168
+178 <-> 169
+179 <-> 170
+Not mapped:
+48
+52
diff --git a/testData/results/TestPrivateEmptyConstructor.dec b/testData/results/TestPrivateEmptyConstructor.dec
new file mode 100644
index 0000000..3f866b1
--- /dev/null
+++ b/testData/results/TestPrivateEmptyConstructor.dec
@@ -0,0 +1,28 @@
+package pkg;
+
+public final class TestPrivateEmptyConstructor {
+   private TestPrivateEmptyConstructor() {
+   }// 4
+
+   public final void test() {
+      System.out.println("test");// 7
+   }// 8
+}
+
+class 'pkg/TestPrivateEmptyConstructor' {
+   method '<init> ()V' {
+      4      4
+   }
+
+   method 'test ()V' {
+      0      7
+      3      7
+      5      7
+      8      8
+   }
+}
+
+Lines mapping:
+4 <-> 5
+7 <-> 8
+8 <-> 9
diff --git a/testData/results/TestShadowing.dec b/testData/results/TestShadowing.dec
new file mode 100644
index 0000000..b7c0cd7
--- /dev/null
+++ b/testData/results/TestShadowing.dec
@@ -0,0 +1,7 @@
+package pkg;
+
+class TestShadowing extends TestShadowingSuperClass {
+   ext.Shadow.B instanceOfB = new ext.Shadow.B();
+   java.util.Calendar.Builder calBuilder = new java.util.Calendar.Builder();
+}
+
diff --git a/testData/results/TestStaticNameClash.dec b/testData/results/TestStaticNameClash.dec
new file mode 100644
index 0000000..1c0f21a
--- /dev/null
+++ b/testData/results/TestStaticNameClash.dec
@@ -0,0 +1,20 @@
+package pkg;
+
+public class TestStaticNameClash {
+   public static String property;
+
+   public static void setProperty(String property) {
+      TestStaticNameClash.property = property;// 8
+   }// 9
+}
+
+class 'pkg/TestStaticNameClash' {
+   method 'setProperty (Ljava/lang/String;)V' {
+      1      6
+      4      7
+   }
+}
+
+Lines mapping:
+8 <-> 7
+9 <-> 8
diff --git a/testData/results/TestStringConcat.dec b/testData/results/TestStringConcat.dec
new file mode 100644
index 0000000..b3fc995
--- /dev/null
+++ b/testData/results/TestStringConcat.dec
@@ -0,0 +1,31 @@
+package pkg;
+
+public class TestStringConcat {
+   public String test1(String var1, int var2) {
+      return var1 + var2;// 20
+   }
+
+   public String test2(String var1, int var2, Object var3) {
+      return "(" + var1 + "-" + var2 + "---" + var3 + ")";// 24
+   }
+}
+
+class 'pkg/TestStringConcat' {
+   method 'test1 (Ljava/lang/String;I)Ljava/lang/String;' {
+      f      4
+      12      4
+   }
+
+   method 'test2 (Ljava/lang/String;ILjava/lang/Object;)Ljava/lang/String;' {
+      7      8
+      10      8
+      19      8
+      22      8
+      27      8
+      2a      8
+   }
+}
+
+Lines mapping:
+20 <-> 5
+24 <-> 9
diff --git a/testData/results/TestStringLiterals.dec b/testData/results/TestStringLiterals.dec
new file mode 100644
index 0000000..c5afe18
--- /dev/null
+++ b/testData/results/TestStringLiterals.dec
@@ -0,0 +1,38 @@
+package pkg;
+
+public class TestStringLiterals {
+   public static void main(String[] var0) {
+      String var1 = "abc\b\t\n\f\r\"'\\def";// 20
+      char[] var2 = new char[]{'\b', '\t', '\n', '\f', '\r', '"', '\'', '\\'};// 21
+      System.out.println(var1);// 22
+      System.out.println(var2);// 23
+   }// 24
+}
+
+class 'pkg/TestStringLiterals' {
+   method 'main ([Ljava/lang/String;)V' {
+      0      4
+      2      4
+      9      5
+      e      5
+      13      5
+      18      5
+      1d      5
+      22      5
+      28      5
+      2e      5
+      31      5
+      32      6
+      36      6
+      39      7
+      3d      7
+      40      8
+   }
+}
+
+Lines mapping:
+20 <-> 5
+21 <-> 6
+22 <-> 7
+23 <-> 8
+24 <-> 9
diff --git a/testData/results/TestSuperInner.dec b/testData/results/TestSuperInner.dec
new file mode 100644
index 0000000..840aa69
--- /dev/null
+++ b/testData/results/TestSuperInner.dec
@@ -0,0 +1,19 @@
+package pkg;
+
+class TestSuperInner extends TestSuperInnerBase {
+   protected abstract class Inner2 extends TestSuperInnerBase.Inner {
+      protected Inner2() {
+         super();// 4
+      }
+   }
+}
+
+class 'pkg/TestSuperInner$Inner2' {
+   method '<init> (Lpkg/TestSuperInner;)V' {
+      7      5
+      a      6
+   }
+}
+
+Lines mapping:
+4 <-> 6
diff --git a/testData/results/TestSuspendLambdaKt.dec b/testData/results/TestSuspendLambdaKt.dec
new file mode 100644
index 0000000..f4623b2
--- /dev/null
+++ b/testData/results/TestSuspendLambdaKt.dec
@@ -0,0 +1,149 @@
+package pkg;
+
+import kotlin.Metadata;
+import kotlin.Unit;
+import kotlin.Result.Failure;
+import kotlin.coroutines.Continuation;
+import kotlin.coroutines.intrinsics.IntrinsicsKt;
+import kotlin.coroutines.jvm.internal.DebugMetadata;
+import kotlin.coroutines.jvm.internal.SuspendLambda;
+import kotlin.jvm.functions.Function1;
+import kotlin.jvm.internal.Intrinsics;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+@Metadata(
+   mv = {1, 1, 13},
+   bv = {1, 0, 3},
+   k = 2,
+   d1 = {"\u0000\u0016\n\u0000\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0010\u0002\n\u0002\u0010\u0000\n\u0002\b\u0003\",\u0010\u0000\u001a\u0018\b\u0001\u0012\n\u0012\b\u0012\u0004\u0012\u00020\u00030\u0002\u0012\u0006\u0012\u0004\u0018\u00010\u00040\u0001ø\u0001\u0000¢\u0006\n\n\u0002\u0010\u0007\u001a\u0004\b\u0005\u0010\u0006\u0082\u0002\u0004\n\u0002\b\u0019"},
+   d2 = {"sl1", "Lkotlin/Function1;", "Lkotlin/coroutines/Continuation;", "", "", "getSl1", "()Lkotlin/jvm/functions/Function1;", "Lkotlin/jvm/functions/Function1;"}
+)
+public final class TestSuspendLambdaKt {
+   @NotNull
+   private static final Function1<Continuation<? super Unit>, Object> sl1;
+
+   @NotNull
+   public static final Function1<Continuation<? super Unit>, Object> getSl1() {
+      return sl1;
+   }
+
+   static {
+      @DebugMetadata(
+         f = "TestSuspendLambda.kt",
+         l = {3},
+         i = {},
+         s = {},
+         n = {},
+         m = "invokeSuspend",
+         c = "pkg/TestSuspendLambdaKt$sl1$1"
+      )
+      @Metadata(
+         mv = {1, 1, 13},
+         bv = {1, 0, 3},
+         k = 3,
+         d1 = {"\u0000\n\n\u0000\n\u0002\u0010\u0002\n\u0002\b\u0002\u0010\u0000\u001a\u00020\u0001H\u008a@ø\u0001\u0000¢\u0006\u0004\b\u0002\u0010\u0003"},
+         d2 = {"<anonymous>", "", "invoke", "(Ljava/lang/Object;)Ljava/lang/Object;"}
+      )
+      final class NamelessClass_1 extends SuspendLambda implements Function1<Continuation<? super Unit>, Object> {
+         int label;
+
+         @Nullable
+         public final Object invokeSuspend(@NotNull Object result) {
+            Object var3 = IntrinsicsKt.getCOROUTINE_SUSPENDED();
+            switch(this.label) {
+            case 0:
+               if (result instanceof Failure) {
+                  throw ((Failure)result).exception;
+               }
+
+               String var2 = "SL1";// 4
+               System.out.println(var2);
+               return Unit.INSTANCE;// 5
+            default:
+               throw new IllegalStateException("call to 'resume' before 'invoke' with coroutine");
+            }
+         }
+
+         NamelessClass_1(Continuation var1) {
+            super(1, var1);
+         }
+
+         @NotNull
+         public final Continuation<Unit> create(@NotNull Continuation<?> completion) {
+            Intrinsics.checkParameterIsNotNull(completion, "completion");
+            NamelessClass_1 var2 = new NamelessClass_1(completion);
+            return var2;
+         }
+
+         public final Object invoke(Object var1) {
+            return ((NamelessClass_1)this.create((Continuation)var1)).invokeSuspend(Unit.INSTANCE);
+         }
+      }
+
+      sl1 = (Function1)(new NamelessClass_1((Continuation)null));// 3
+   }
+}
+
+class 'pkg/TestSuspendLambdaKt' {
+   method 'getSl1 ()Lkotlin/jvm/functions/Function1;' {
+      0      27
+      3      27
+   }
+
+   method '<clinit> ()V' {
+      4      83
+      8      83
+      b      83
+      e      84
+   }
+}
+
+class 'pkg/TestSuspendLambdaKt$sl1$1' {
+   method 'invokeSuspend (Ljava/lang/Object;)Ljava/lang/Object;' {
+      0      52
+      3      52
+      5      53
+      8      53
+      1e      55
+      21      55
+      24      56
+      27      56
+      2a      56
+      2c      59
+      2e      59
+      2f      60
+      33      60
+      36      61
+      39      61
+      3e      63
+      43      63
+   }
+
+   method '<init> (Lkotlin/coroutines/Continuation;)V' {
+      1      68
+      3      68
+      6      69
+   }
+
+   method 'create (Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;' {
+      1      73
+      3      73
+      e      74
+      10      75
+   }
+
+   method 'invoke (Ljava/lang/Object;)Ljava/lang/Object;' {
+      2      79
+      5      79
+      8      79
+      b      79
+      e      79
+      11      79
+   }
+}
+
+Lines mapping:
+3 <-> 84
+4 <-> 60
+5 <-> 62
diff --git a/testData/results/TestSwitchOnEnum.dec b/testData/results/TestSwitchOnEnum.dec
new file mode 100644
index 0000000..b6984c3
--- /dev/null
+++ b/testData/results/TestSwitchOnEnum.dec
@@ -0,0 +1,98 @@
+package pkg;
+
+import java.util.concurrent.TimeUnit;
+
+public class TestSwitchOnEnum {
+   int myInt;
+
+   public int testSOE(TimeUnit t) {
+      switch(t) {// 14
+      case MICROSECONDS:
+         return 2;// 16
+      case SECONDS:
+         return 1;// 18
+      default:
+         return 0;// 20
+      }
+   }
+
+   static class Example {
+      void test(TestSwitchOnEnum.Example.A a, TestSwitchOnEnum.Example.B b) {
+         switch(a) {// 30
+         case A1:
+            System.out.println("A1");// 32
+            break;// 33
+         case A2:
+            System.out.println("A2");// 35
+         }
+
+         switch(b) {// 38
+         case B1:
+            System.out.println("B1");// 40
+            break;// 41
+         case B2:
+            System.out.println("B2");// 43
+         }
+
+      }// 46
+
+      static enum B {
+         B1,
+         B2;
+      }
+
+      static enum A {
+         A1,
+         A2;
+      }
+   }
+}
+
+class 'pkg/TestSwitchOnEnum' {
+   method 'testSOE (Ljava/util/concurrent/TimeUnit;)I' {
+      8      8
+      24      10
+      25      10
+      26      12
+      27      12
+      28      14
+      29      14
+   }
+}
+
+class 'pkg/TestSwitchOnEnum$Example' {
+   method 'test (Lpkg/TestSwitchOnEnum$Example$A;Lpkg/TestSwitchOnEnum$Example$B;)V' {
+      8      20
+      24      22
+      27      22
+      29      22
+      2c      23
+      2f      25
+      32      25
+      34      25
+      3f      28
+      58      30
+      5b      30
+      5d      30
+      60      31
+      63      33
+      66      33
+      68      33
+      6b      36
+   }
+}
+
+Lines mapping:
+14 <-> 9
+16 <-> 11
+18 <-> 13
+20 <-> 15
+30 <-> 21
+32 <-> 23
+33 <-> 24
+35 <-> 26
+38 <-> 29
+40 <-> 31
+41 <-> 32
+43 <-> 34
+46 <-> 37
diff --git a/testData/results/TestSwitchOnStrings.dec b/testData/results/TestSwitchOnStrings.dec
new file mode 100644
index 0000000..cd120e8
--- /dev/null
+++ b/testData/results/TestSwitchOnStrings.dec
@@ -0,0 +1,13 @@
+package pkg;
+
+public class TestSwitchOnStrings {
+  public int testSOE(String s) {
+    switch (s) {
+      case "xxx":
+        return 2;
+      case "yyy":
+        return 1;
+    }
+    return 0;
+  }
+}
diff --git a/testData/results/TestSynchronizedUnprotected.dec b/testData/results/TestSynchronizedUnprotected.dec
new file mode 100644
index 0000000..d6405e8
--- /dev/null
+++ b/testData/results/TestSynchronizedUnprotected.dec
@@ -0,0 +1,42 @@
+package pkg;
+
+import kotlin.Metadata;
+import kotlin.Unit;
+
+@Metadata(
+   mv = {1, 1, 11},
+   bv = {1, 0, 2},
+   k = 1,
+   xi = 2,
+   d1 = {"\u0000\u0010\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\b\u0002\n\u0002\u0010\u0002\u0018\u00002\u00020\u0001B\u0005¢\u0006\u0002\u0010\u0002J\u0006\u0010\u0003\u001a\u00020\u0004"},
+   d2 = {"Lpkg/TestSynchronizedUnprotected;", "", "()V", "test", ""}
+)
+public final class TestSynchronizedUnprotected {
+   public final void test() {
+      synchronized(this) {
+         String var2 = "Boom";// 6
+         System.out.println(var2);
+         Unit var3 = Unit.INSTANCE;// 5 7
+      }
+   }
+}
+
+class 'pkg/TestSynchronizedUnprotected' {
+   method 'test ()V' {
+      3      15
+      5      16
+      7      16
+      8      17
+      c      17
+      f      18
+      12      18
+      15      20
+   }
+}
+
+Lines mapping:
+5 <-> 19
+6 <-> 17
+7 <-> 19
+Not mapped:
+8
diff --git a/testData/results/TestSyntheticAccess.dec b/testData/results/TestSyntheticAccess.dec
new file mode 100644
index 0000000..d5016a2
--- /dev/null
+++ b/testData/results/TestSyntheticAccess.dec
@@ -0,0 +1,97 @@
+package pkg;
+
+class TestSyntheticAccess {
+   private static int s;
+   private int i;
+
+   private class Assigner {
+      void assignI(int var1) {
+         TestSyntheticAccess.this.i = var1;// 32
+      }// 33
+
+      void assignS(int var1) {
+         TestSyntheticAccess.s = var1;// 36
+      }// 37
+   }
+
+   private class Incrementer {
+      void orI() {
+         TestSyntheticAccess.this.i = TestSyntheticAccess.this.i | 1;// 10
+      }// 11
+
+      void incrementI() {
+         TestSyntheticAccess.this.i++;// 14
+      }// 15
+
+      void decrementI() {
+         --TestSyntheticAccess.this.i;// 18
+      }// 19
+
+      void incrementS() {
+         ++TestSyntheticAccess.s;// 22
+      }// 23
+
+      void decrementS() {
+         TestSyntheticAccess.s--;// 26
+      }// 27
+   }
+}
+
+class 'pkg/TestSyntheticAccess$Assigner' {
+   method 'assignI (I)V' {
+      5      8
+      9      9
+   }
+
+   method 'assignS (I)V' {
+      1      12
+      5      13
+   }
+}
+
+class 'pkg/TestSyntheticAccess$Incrementer' {
+   method 'orI ()V' {
+      8      18
+      b      18
+      d      18
+      11      19
+   }
+
+   method 'incrementI ()V' {
+      2      22
+      4      22
+      8      23
+   }
+
+   method 'decrementI ()V' {
+      2      26
+      4      26
+      8      27
+   }
+
+   method 'incrementS ()V' {
+      0      30
+      4      31
+   }
+
+   method 'decrementS ()V' {
+      0      34
+      4      35
+   }
+}
+
+Lines mapping:
+10 <-> 19
+11 <-> 20
+14 <-> 23
+15 <-> 24
+18 <-> 27
+19 <-> 28
+22 <-> 31
+23 <-> 32
+26 <-> 35
+27 <-> 36
+32 <-> 9
+33 <-> 10
+36 <-> 13
+37 <-> 14
diff --git a/testData/results/TestThrowException.dec b/testData/results/TestThrowException.dec
index eae0e70..7c52234 100644
--- a/testData/results/TestThrowException.dec
+++ b/testData/results/TestThrowException.dec
@@ -4,7 +4,7 @@ public class TestThrowException {
    Runnable r;
 
    public TestThrowException(int var1) {
-      if(var1 > 0) {// 9
+      if (var1 > 0) {// 9
          throw new IllegalArgumentException("xxx");// 10
       } else {
          this.r = new Runnable() {// 12
diff --git a/testData/results/TestTryCatchFinally.dec b/testData/results/TestTryCatchFinally.dec
index 772a76e..2af717c 100644
--- a/testData/results/TestTryCatchFinally.dec
+++ b/testData/results/TestTryCatchFinally.dec
@@ -8,7 +8,6 @@ public class TestTryCatchFinally {
          try {
             System.out.println("sout2");// 27
          } catch (Exception var8) {// 28
-            ;
          }
       } finally {
          System.out.println("finally");// 34
@@ -17,9 +16,9 @@ public class TestTryCatchFinally {
    }// 36
 
    int foo(int var1) throws Exception {
-      if(var1 < 1) {// 39
+      if (var1 < 1) {// 39
          throw new RuntimeException();// 40
-      } else if(var1 < 5) {// 41
+      } else if (var1 < 5) {// 41
          return var1;// 42
       } else {
          throw new Exception();// 45
@@ -49,36 +48,36 @@ class 'pkg/TestTryCatchFinally' {
       17      8
       19      8
       1f      9
-      2b      13
-      2d      13
-      30      13
-      38      16
+      2b      12
+      2d      12
+      30      12
+      38      15
    }
 
    method 'foo (I)I' {
-      1      19
-      2      19
-      c      20
-      e      21
-      f      21
-      13      22
-      1b      24
+      1      18
+      2      18
+      c      19
+      e      20
+      f      20
+      13      21
+      1b      23
    }
 
    method 'test (Ljava/lang/String;)I' {
-      1      30
-      4      30
-      e      31
-      f      32
-      10      33
-      1a      33
-      23      33
-      26      33
-      31      38
-      34      35
-      35      35
-      38      35
-      3f      38
+      1      29
+      4      29
+      e      30
+      f      31
+      10      32
+      1a      32
+      23      32
+      26      32
+      31      37
+      34      34
+      35      34
+      38      34
+      3f      37
    }
 }
 
@@ -86,19 +85,19 @@ Lines mapping:
 24 <-> 6
 27 <-> 9
 28 <-> 10
-34 <-> 14
-36 <-> 17
-39 <-> 20
-40 <-> 21
-41 <-> 22
-42 <-> 23
-45 <-> 25
-51 <-> 31
-52 <-> 33
-53 <-> 34
-55 <-> 36
-56 <-> 39
-57 <-> 39
+34 <-> 13
+36 <-> 16
+39 <-> 19
+40 <-> 20
+41 <-> 21
+42 <-> 22
+45 <-> 24
+51 <-> 30
+52 <-> 32
+53 <-> 33
+55 <-> 35
+56 <-> 38
+57 <-> 38
 Not mapped:
 25
 32
diff --git a/testData/results/TestUnionType.dec b/testData/results/TestUnionType.dec
new file mode 100644
index 0000000..1b541d8
--- /dev/null
+++ b/testData/results/TestUnionType.dec
@@ -0,0 +1,28 @@
+package pkg;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+public interface TestUnionType {
+   static Comparator comparingInt() {
+      return (Comparator & Serializable)((c1, c2) -> {// 8
+         return 1;
+      }));
+   }
+}
+
+class 'pkg/TestUnionType' {
+   method 'lambda$comparingInt$ff46620a$1 (Ljava/lang/Object;Ljava/lang/Object;)I' {
+      0      8
+      1      8
+   }
+
+   method 'comparingInt ()Ljava/util/Comparator;' {
+      5      7
+      8      7
+      b      7
+   }
+}
+
+Lines mapping:
+8 <-> 8
diff --git a/testData/results/TestVarArgCalls.dec b/testData/results/TestVarArgCalls.dec
new file mode 100644
index 0000000..6cdcd8f
--- /dev/null
+++ b/testData/results/TestVarArgCalls.dec
@@ -0,0 +1,103 @@
+package pkg;
+
+public class TestVarArgCalls {
+   public void doSmth() {
+      this.printAll("Test");// 5
+      this.printAll("Test: %s", "abc");// 6
+      this.printAll("Test: %s - %s", "abc", "DEF");// 7
+      this.printComplex("Test");// 9
+      this.printComplex("Test: %[0]s", new String[]{"abc"});// 10
+      this.printComplex("Test: %[0]s - %[0]s", new String[]{"abc"}, new String[]{"DEF"});// 11
+      String.format("Test");// 13
+      String.format("Test: %d", 123);// 14
+      String.format("Test: %d - %s", 123, "DEF");// 15
+      Object[] data = new Object[]{"Hello"};// 17
+      String.format("Test: %s", (Object)data);// 18
+      String.format("Test: %s", (Object[])data);// 19
+   }// 20
+
+   public void printAll(String fmt, String... params) {
+      System.out.println(String.format(fmt, (Object[])params));// 23
+   }// 24
+
+   public void printComplex(String fmt, String[]... params) {
+      System.out.println(String.format(fmt, (Object[])params));// 27
+   }// 28
+}
+
+class 'pkg/TestVarArgCalls' {
+   method 'doSmth ()V' {
+      1      4
+      7      4
+      b      5
+      13      5
+      16      5
+      1a      6
+      22      6
+      27      6
+      2a      6
+      2e      7
+      34      7
+      38      8
+      46      8
+      4a      8
+      4e      9
+      5c      9
+      68      9
+      6c      9
+      6f      10
+      75      10
+      79      11
+      81      11
+      83      11
+      87      11
+      8b      12
+      93      12
+      95      12
+      9b      12
+      9e      12
+      a8      13
+      ab      13
+      ac      14
+      b6      14
+      ba      15
+      bd      15
+      c0      15
+      c4      16
+   }
+
+   method 'printAll (Ljava/lang/String;[Ljava/lang/String;)V' {
+      0      19
+      5      19
+      8      19
+      b      19
+      e      20
+   }
+
+   method 'printComplex (Ljava/lang/String;[[Ljava/lang/String;)V' {
+      0      23
+      5      23
+      8      23
+      b      23
+      e      24
+   }
+}
+
+Lines mapping:
+5 <-> 5
+6 <-> 6
+7 <-> 7
+9 <-> 8
+10 <-> 9
+11 <-> 10
+13 <-> 11
+14 <-> 12
+15 <-> 13
+17 <-> 14
+18 <-> 15
+19 <-> 16
+20 <-> 17
+23 <-> 20
+24 <-> 21
+27 <-> 24
+28 <-> 25
diff --git a/testData/results/TypeAnnotations.dec b/testData/results/TypeAnnotations.dec
new file mode 100644
index 0000000..590d894
--- /dev/null
+++ b/testData/results/TypeAnnotations.dec
@@ -0,0 +1,44 @@
+package pkg;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+class TypeAnnotations {
+   @TypeAnnotations.TA("field type")
+   private String f1;
+   @TypeAnnotations.MixA("field and type")
+   private String f2;
+
+   @TypeAnnotations.TA("return type")
+   int m1() {
+      return 42;// 18
+   }
+
+   void m2(@TypeAnnotations.TA("parameter") int var1) {
+   }// 21
+
+   @Target({ElementType.FIELD, ElementType.TYPE_USE})
+   @interface MixA {
+      String value();
+   }
+
+   @Target({ElementType.TYPE_USE})
+   @interface TA {
+      String value();
+   }
+}
+
+class 'pkg/TypeAnnotations' {
+   method 'm1 ()I' {
+      0      13
+      2      13
+   }
+
+   method 'm2 (I)V' {
+      0      17
+   }
+}
+
+Lines mapping:
+18 <-> 14
+21 <-> 18
diff --git a/testData/results/package-info.dec b/testData/results/package-info.dec
new file mode 100644
index 0000000..f19fbea
--- /dev/null
+++ b/testData/results/package-info.dec
@@ -0,0 +1,2 @@
+@jdk.Exported
+package pkg;
\ No newline at end of file
diff --git a/testData/src/ext/Shadow.java b/testData/src/ext/Shadow.java
new file mode 100644
index 0000000..02869ca
--- /dev/null
+++ b/testData/src/ext/Shadow.java
@@ -0,0 +1,6 @@
+package ext;
+
+// companion class for pkg/TestShadowing.java
+public class Shadow {
+  public static class B { }
+}
\ No newline at end of file
diff --git a/testData/src/ext/TestClashNameIface.java b/testData/src/ext/TestClashNameIface.java
new file mode 100644
index 0000000..9d7630b
--- /dev/null
+++ b/testData/src/ext/TestClashNameIface.java
@@ -0,0 +1,4 @@
+package ext;
+interface TestClashNameIface {
+  public void foo();
+}
diff --git a/testData/src/ext/TestClashNameParent.java b/testData/src/ext/TestClashNameParent.java
new file mode 100644
index 0000000..7691344
--- /dev/null
+++ b/testData/src/ext/TestClashNameParent.java
@@ -0,0 +1,5 @@
+package ext;
+
+public class TestClashNameParent {
+  int SharedName3 = 0;
+}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC.java b/testData/src/java11/TestJava11StringConcat.java
similarity index 60%
rename from src/org/jetbrains/java/decompiler/code/optinstructions/LDC.java
rename to testData/src/java11/TestJava11StringConcat.java
index ae7b3c6..3f9e040 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC.java
+++ b/testData/src/java11/TestJava11StringConcat.java
@@ -13,21 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.java.decompiler.code.optinstructions;
+package java11;
 
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class LDC extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_ldc);
-    out.writeByte(getOperand(0));
+public class TestJava11StringConcat {
+  public String test1(String prefix, int a) {
+    return prefix + a;
   }
 
-  public int length() {
-    return 2;
+  public String test2(String var, int b, Object c) {
+    return "(" + var + "-" + b + "---" + c + ")";
   }
-}
+}
\ No newline at end of file
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/NEW.java b/testData/src/java9/TestJava9StringConcat.java
similarity index 60%
rename from src/org/jetbrains/java/decompiler/code/optinstructions/NEW.java
rename to testData/src/java9/TestJava9StringConcat.java
index 2e8854f..9e19596 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/NEW.java
+++ b/testData/src/java9/TestJava9StringConcat.java
@@ -13,21 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.java.decompiler.code.optinstructions;
+package java9;
 
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class NEW extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_new);
-    out.writeShort(getOperand(0));
+public class TestJava9StringConcat {
+  public String test1(String prefix, int a) {
+    return prefix + a;
   }
 
-  public int length() {
-    return 3;
+  public String test2(String var, int b, Object c) {
+    return "(" + var + "-" + b + "---" + c + ")";
   }
-}
+}
\ No newline at end of file
diff --git a/testData/src/pkg/MoreAnnotations.java b/testData/src/pkg/MoreAnnotations.java
new file mode 100644
index 0000000..d29abce
--- /dev/null
+++ b/testData/src/pkg/MoreAnnotations.java
@@ -0,0 +1,89 @@
+package pkg;
+
+public @interface MoreAnnotations {
+
+  int intValue() default 1;
+  byte byteValue() default 1;
+  float floatValue() default Float.POSITIVE_INFINITY;
+  double doubleValue() default Double.NaN;
+  boolean booleanValue() default true;
+  short shortValue() default 1;
+  long longValue() default 1;
+  char charValue() default '0';
+  TestEnum enumValue() default TestEnum.FirstValue;
+  NestedAnnotation annotationValue() default @NestedAnnotation;
+  String stringValue() default "default";
+  Class<? extends CharSequence> classValue() default CharSequence.class;
+
+  int[] intArray() default { 1, 0, Integer.MAX_VALUE, Integer.MIN_VALUE };
+  byte[] byteArray() default { 1, 0, Byte.MAX_VALUE, Byte.MIN_VALUE, (byte)0xFF };
+  float[] floatArray() default { 1, 0, Float.MAX_VALUE, Float.MIN_VALUE, Float.NaN, Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY };
+  double[] doubleArray() default {  1, 0, Double.MAX_VALUE, Double.MIN_VALUE, Double.NaN, Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY };
+  boolean[] booleanArray() default { true, false };
+  short[] shortArray() default { 1, 0, Short.MAX_VALUE, Short.MIN_VALUE, (short)0xFFFF };
+  long[] longArray() default { 1, 0, Long.MAX_VALUE, Long.MIN_VALUE };
+  char[] charArray() default { 1, 0, Character.MAX_VALUE, Character.MIN_VALUE };
+  TestEnum[] enumArray() default { TestEnum.FirstValue };
+  NestedAnnotation[] annotationArray() default { @NestedAnnotation };
+  String[] stringArray() default { "first", "second", "" };
+  Class<? extends CharSequence>[] classArray() default { CharSequence.class, String.class, StringBuilder.class };
+
+  @interface NestedAnnotation {
+    String value() default "MyString";
+  }
+
+  @MoreAnnotations(
+    intValue = 1,
+    byteValue = 1,
+    floatValue = 1,
+    doubleValue = 1,
+    booleanValue = true,
+    shortValue = 1,
+    longValue = 1,
+    charValue = '\n',
+    enumValue = TestEnum.FirstValue,
+    annotationValue = @NestedAnnotation("a"),
+    stringValue = "",
+    classValue = String.class
+  )
+  String annotatedWithValues = "";
+
+  @MoreAnnotations(
+    intArray = {},
+    byteArray = {},
+    floatArray = {},
+    doubleArray = {},
+    booleanArray = {},
+    shortArray = {},
+    longArray = {},
+    charArray = {},
+    enumArray = {},
+    annotationArray = {},
+    stringArray =  {},
+    classArray = {}
+  )
+  String annotatedWithEmptyArrays = "";
+
+  @MoreAnnotations(
+    intArray = { 1, 0, Integer.MAX_VALUE, Integer.MIN_VALUE },
+    byteArray = { 1, 0, Byte.MAX_VALUE, Byte.MIN_VALUE, (byte)0xFF },
+    floatArray = { 1, 0, Float.MAX_VALUE, Float.MIN_VALUE, Float.NaN, Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY },
+    doubleArray = {  1, 0, Double.MAX_VALUE, Double.MIN_VALUE, Double.NaN, Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY },
+    booleanArray = { true, false },
+    shortArray = { 1, 0, Short.MAX_VALUE, Short.MIN_VALUE, (short)0xFFFF },
+    longArray = { 1, 0, Long.MAX_VALUE, Long.MIN_VALUE },
+    charArray = { 'a', '\n', 1, 0, Character.MAX_VALUE, Character.MIN_VALUE },
+    enumArray = { TestEnum.FirstValue , TestEnum.SecondValue },
+    annotationArray = { @NestedAnnotation("a"), @NestedAnnotation("b") },
+    stringArray = { "first", "second", "" },
+    classArray = { CharSequence.class, String.class, StringBuilder.class }
+  )
+  String annotatedWithArrays = "";
+
+  public enum TestEnum {
+
+    FirstValue,
+    SecondValue
+
+  }
+}
diff --git a/testData/src/pkg/Shadow.java b/testData/src/pkg/Shadow.java
new file mode 100644
index 0000000..d76fb78
--- /dev/null
+++ b/testData/src/pkg/Shadow.java
@@ -0,0 +1,4 @@
+package pkg;
+
+// companion class for pkg/TestShadowing.java
+public class Shadow { }
\ No newline at end of file
diff --git a/testData/src/pkg/TestAccessReplace.java b/testData/src/pkg/TestAccessReplace.java
new file mode 100644
index 0000000..e5a21bc
--- /dev/null
+++ b/testData/src/pkg/TestAccessReplace.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pkg;
+
+public class TestAccessReplace {
+  private static void fooS() {};
+  private void foo() {};
+  private static void fooSParams(long a, long b) {};
+  private void fooParams(long a, long b) {};
+
+  public class Inner {
+    public Inner(String b) {
+      fooS();
+      foo();
+      fooSParams(1,2);
+      fooParams(1,2);
+    }
+  }
+}
diff --git a/testData/src/pkg/TestAnonymousClassConstructor.java b/testData/src/pkg/TestAnonymousClassConstructor.java
new file mode 100644
index 0000000..5104b50
--- /dev/null
+++ b/testData/src/pkg/TestAnonymousClassConstructor.java
@@ -0,0 +1,103 @@
+package pkg;
+
+class TestAnonymousClassConstructor {
+  void innerPrivateString() {
+    new InnerPrivateString("text"){};
+  }
+
+  void innerPrivate() {
+    new InnerPrivate(3, 4){};
+  }
+
+  void innerStaticPrivateString() {
+    new InnerStaticPrivateString("text"){};
+  }
+
+  void innerStaticPrivate() {
+    new InnerStaticPrivate(3, 4){};
+  }
+
+  static void innerStaticPrivateStringStatic() {
+    new InnerStaticPrivateString("text"){};
+  }
+
+  static void innerStaticPrivateStatic() {
+    new InnerStaticPrivate(3, 4){};
+  }
+
+  void innerPublicString() {
+    new InnerPublicString("text"){};
+  }
+
+  void innerPublic() {
+    new InnerPublic(3, 4){};
+  }
+
+  void innerStaticPublicString() {
+    new InnerStaticPublicString("text"){};
+  }
+
+  void innerStaticPublic() {
+    new InnerStaticPublic(3, 4){};
+  }
+
+  static void innerStaticPublicStringStatic() {
+    new InnerStaticPublicString("text"){};
+  }
+
+  static void innerStaticPublicStatic() {
+    new InnerStaticPublic(3, 4){};
+  }
+
+  static void n(String s) {
+    System.out.println("n(): " + s);
+  }
+
+  class InnerPrivateString {
+    private InnerPrivateString(String s) {
+      n(s);
+    }
+  }
+
+  class InnerPrivate {
+    private InnerPrivate(long a, int b) {
+      n(a + "+" + b);
+    }
+  }
+
+  static class InnerStaticPrivateString {
+    private InnerStaticPrivateString(String s) {
+      n(s);
+    }
+  }
+
+  static class InnerStaticPrivate {
+    private InnerStaticPrivate(long a, int b) {
+      n(a + "+" + b);
+    }
+  }
+
+  class InnerPublicString {
+    public InnerPublicString(String s) {
+      n(s);
+    }
+  }
+
+  class InnerPublic {
+    public InnerPublic(long a, int b) {
+      n(a + "+" + b);
+    }
+  }
+
+  static class InnerStaticPublicString {
+    public InnerStaticPublicString(String s) {
+      n(s);
+    }
+  }
+
+  static class InnerStaticPublic {
+    public InnerStaticPublic(long a, int b) {
+      n(a + "+" + b);
+    }
+  }
+}
diff --git a/testData/src/pkg/TestAnonymousParamNames.java b/testData/src/pkg/TestAnonymousParamNames.java
new file mode 100644
index 0000000..5c83de9
--- /dev/null
+++ b/testData/src/pkg/TestAnonymousParamNames.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pkg;
+
+import java.io.File;
+
+public class TestAnonymousParamNames {
+  private final Clazz reference = new Clazz(0, false) {};
+
+  private class Clazz {
+    public Clazz(long paramL, boolean paramB) {
+    }
+  }
+}
diff --git a/testData/src/pkg/TestAnonymousParams.java b/testData/src/pkg/TestAnonymousParams.java
new file mode 100644
index 0000000..55e58bf
--- /dev/null
+++ b/testData/src/pkg/TestAnonymousParams.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pkg;
+
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class TestAnonymousParams {
+  void foo(InputStream in, int a) throws IOException {
+    FilterInputStream filterInputStream = new FilterInputStream(in) {
+      @Override
+      public int read() throws IOException {
+        return a;
+      }
+    };
+    filterInputStream.read();
+  }
+}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/GETFIELD.java b/testData/src/pkg/TestAnonymousSignature.java
similarity index 55%
rename from src/org/jetbrains/java/decompiler/code/optinstructions/GETFIELD.java
rename to testData/src/pkg/TestAnonymousSignature.java
index 6b95aaf..7837c75 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/GETFIELD.java
+++ b/testData/src/pkg/TestAnonymousSignature.java
@@ -13,21 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.java.decompiler.code.optinstructions;
 
-import org.jetbrains.java.decompiler.code.Instruction;
+package pkg;
 
-import java.io.DataOutputStream;
-import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Comparator;
 
-public class GETFIELD extends Instruction {
+public class TestAnonymousSignature {
+  public static void main(String[] args) {
+    // anonymous from class
+    System.out.println(new ArrayList<String>() {
+      @Override
+      public int size() {
+        return super.size();
+      }
+    });
 
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_getfield);
-    out.writeShort(getOperand(0));
+    // anonymous from class
+    System.out.println(new Comparator<String>() {
+      @Override
+      public int compare(String o1, String o2) {
+        return 0;
+      }
+    });
   }
-
-  public int length() {
-    return 3;
-  }
-}
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestAsserts.java b/testData/src/pkg/TestAsserts.java
new file mode 100644
index 0000000..29c7480
--- /dev/null
+++ b/testData/src/pkg/TestAsserts.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pkg;
+
+
+public class TestAsserts {
+  public static int foo() {
+    int i=1;
+    assert i > 1;
+    assert i> 1 && i < 5;
+    return 1;
+  }
+}
diff --git a/testData/src/pkg/TestClashName.java b/testData/src/pkg/TestClashName.java
new file mode 100644
index 0000000..3b13448
--- /dev/null
+++ b/testData/src/pkg/TestClashName.java
@@ -0,0 +1,83 @@
+package pkg;
+
+/*
+ * The names SharedName[123] are shared between variables in local|parent class and class names.
+ * Where approprate, the classes have to be referenced by fully qualified names
+ */
+
+class SharedName1 {
+  static int f = 0;
+
+  static int getF() {
+    return f;
+  }
+}
+
+class SharedName2 {
+  static int f = 0;
+}
+
+class SharedName3 {
+  static int f = 0;
+}
+
+class NonSharedName {
+  static int f = 0;
+
+  static int getF() {
+    return f;
+  }
+}
+
+@interface SharedName4 {
+}
+
+class SharedName5<T>{
+}
+
+class TestClashNameParent {
+
+}
+
+interface TestClashNameIface {
+  public void f();
+}
+// *** Legend for first sentence in comments below:
+// (+) or (-) indicate whether 'pkg' prefix is or is not required when referencing *SharedName*.
+//  The sign is optionally followed by decompiler class name that generates the line that is being commented
+// in a call of getShortName()
+
+@SharedName4 // (-)AnnotationExprent. While a variable named SharedName4 does exist in the annotated class,
+             // lookup process for annotation names never includes variable names.
+public class TestClashName extends ext.TestClashNameParent implements /*pkg.*/TestClashNameIface { // (+)(-)TextUtil
+  int TestClashNameParent = 0;
+  int TestClashNameIface = 0;
+  int SharedName1 = 0;
+  int SharedName4 = 0;
+  int SharedName5 = 0;
+
+  int i = pkg.SharedName1.f;     // (+)FieldExprent. SharedName1 class name is shadowed by a variable in this class
+  int j = NonSharedName.f;       // (-)FieldExprent. The NonSharedName is not used for other objects in the current scope
+  int k = SharedName2.f;         // (-)FieldExprent. SharedName2 variable is not the current scope
+  int l = pkg.SharedName3.f;     // (+)FieldExprent. SharedName3 class name is shadowed by a variable in parent class
+  int m = pkg.SharedName1.getF();// (+)InvocationExprent.  SharedName1 class name is shadowed by a variable in this class
+  int n = NonSharedName.getF();  // (-)InvocationExprent. The NonSharedName is not used for other objects in the current scope
+  SharedName1 p = null;          // (-)ExprProcessor. While a variable named SharedName1 in current scope does exist,
+                                 // namespace in type declaration does not include variable names in a scope
+  SharedName5<SharedName1> q = null;//(-)(-)GenericMain (both names).  While a variable named SharedName1 does exist in current scope,
+                                  // lookup for generic parameters never includes variable names
+
+  @SharedName4 // (-)AnnotationExprent. While a variable named SharedName4 does exist in current scope,
+               // lookup process for annotation names never includes variable names.
+  public int m() {
+    int SharedName2 = i;
+    pkg.SharedName1.f = j;       // (+)FieldExprent. SharedName1 class name is shadowed by a variable in this class
+    int x = pkg.SharedName2.f;   // (+)FieldExprent. SharedName2 class name is shadowed by a variable in this method
+    NonSharedName.f = k;         // (-)ExprProcessor. The NonSharedName is not used for other objects in the current scope
+    int y = NonSharedName.f;     // (-)FieldExprent. The NonSharedName is not used for other objects in the current scope
+    return SharedName2 + x + y;
+  }
+
+  @Override
+  public void f() {}
+}
diff --git a/testData/src/pkg/TestClassFields.java b/testData/src/pkg/TestClassFields.java
index a1f2fac..8a77fe0 100644
--- a/testData/src/pkg/TestClassFields.java
+++ b/testData/src/pkg/TestClassFields.java
@@ -1,28 +1,20 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package pkg;
 
 public class TestClassFields {
+  private static class Inner {
+    private static int staticMutable;
+  }
 
   private static int[] sizes;
   private static String[] names;
 
-  static {
+  private static final int SIZE;
 
+  static {
     names = new String[]{"name1", "name2"};
     sizes = new int[names.length];
+
+    Inner.staticMutable = 3;
+    SIZE = Inner.staticMutable;
   }
-}
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestConstructorReference.java b/testData/src/pkg/TestConstructorReference.java
new file mode 100644
index 0000000..fd8b483
--- /dev/null
+++ b/testData/src/pkg/TestConstructorReference.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class TestConstructorReference {
+  public TestConstructorReference() {
+  }
+
+  void boo() {
+    Runnable aNew = TestConstructorReference::new;
+  }
+}
diff --git a/testData/src/pkg/TestEmptyBlocks.java b/testData/src/pkg/TestEmptyBlocks.java
new file mode 100644
index 0000000..30e196f
--- /dev/null
+++ b/testData/src/pkg/TestEmptyBlocks.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.util.Random;
+
+public class TestEmptyBlocks {
+
+  public static void foo() {
+    try {
+      int a = 0;  //make sure whole try/catch not removed by compiler
+    } catch(Exception e) {
+
+    }
+
+    for(int i = 0; i < 5; i++) {
+
+    }
+
+    while(new Random().nextBoolean()) {
+
+    }
+
+    if(new Random().nextBoolean()) {
+
+    }
+  }
+
+
+
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestEnum.java b/testData/src/pkg/TestEnum.java
index 43fab48..e474d34 100644
--- a/testData/src/pkg/TestEnum.java
+++ b/testData/src/pkg/TestEnum.java
@@ -21,16 +21,18 @@ public enum TestEnum {
     @Override
     public void m() { }
   },
-  E3("-"),
-  E4("+") {
+  E3("-", Type.ODD),
+  E4("+", Type.EVEN) {
     @Override
     public void m() { }
   };
 
+  private enum Type {ODD, EVEN}
+
   public void m() { }
 
   private String s;
 
-  private TestEnum() { this("?"); }
-  private TestEnum(@Deprecated String s) { this.s = s; }
+  private TestEnum() { this("?", null); }
+  private TestEnum(@Deprecated String s, Type t) { this.s = s; }
 }
diff --git a/testData/src/pkg/TestExtendingSubclass.java b/testData/src/pkg/TestExtendingSubclass.java
new file mode 100644
index 0000000..f63baed
--- /dev/null
+++ b/testData/src/pkg/TestExtendingSubclass.java
@@ -0,0 +1,18 @@
+package pkg;
+
+import java.math.BigDecimal;
+
+public class TestExtendingSubclass {
+
+  class Subclass1 {
+    Subclass1(String name) {
+    }
+  }
+
+  class Subclass2 extends Subclass1 {
+    Subclass2(String name) {
+      super(name);
+    }
+  }
+
+}
diff --git a/testData/src/pkg/TestFieldSingleAccess.jasm b/testData/src/pkg/TestFieldSingleAccess.jasm
new file mode 100644
index 0000000..57b203c
--- /dev/null
+++ b/testData/src/pkg/TestFieldSingleAccess.jasm
@@ -0,0 +1,67 @@
+/**
+ * This code can be assembled with <a href="https://wiki.openjdk.java.net/display/CodeTools/asmtools">asmtools</a>
+ * using <code>asmtools jasm -g *.jasm</code> command line.
+ */
+package  pkg;
+
+super public final class TestFieldSingleAccess
+	version 52:0
+{
+
+public Field field:"Ljava/lang/Integer;";
+
+public Method "<init>":"()V"
+	stack 1 locals 1
+{
+		aload_0;
+		invokespecial	Method java/lang/Object."<init>":"()V";
+		return;
+}
+
+public final Method test:"()V"
+	stack 2 locals 1
+{
+		aload_0;
+		getfield	Field field:"Ljava/lang/Integer;";
+		dup;
+		ifnull	L17;
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		swap;
+		invokevirtual	Method java/io/PrintStream.println:"(Ljava/lang/Object;)V";
+	L17:	stack_frame_type same;
+		return;
+}
+
+public final Method test1:"()V"
+	stack 2 locals 3
+{
+		aload_0;
+		getfield	Field field:"Ljava/lang/Integer;";
+		dup;
+		astore_1;
+		monitorenter;
+		try t0;
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		bipush	49;
+		invokevirtual	Method java/io/PrintStream.println:"(C)V";
+		aload_1;
+		monitorexit;
+		endtry t0;
+		goto	L25;
+		catch t0 #0;
+		catch t1 #0;
+		try t1;
+		stack_frame_type full;
+		locals_map class TestFieldSingleAccess, class java/lang/Object;
+		stack_map class java/lang/Throwable;
+		astore_2;
+		aload_1;
+		monitorexit;
+		endtry t1;
+		aload_2;
+		athrow;
+	L25:	stack_frame_type chop1;
+		return;
+}
+
+} // end Class TestFieldSingleAccess
diff --git a/testData/src/pkg/TestGenericArgs.java b/testData/src/pkg/TestGenericArgs.java
new file mode 100644
index 0000000..e41d3ca
--- /dev/null
+++ b/testData/src/pkg/TestGenericArgs.java
@@ -0,0 +1,15 @@
+package pkg;
+
+public class TestGenericArgs {
+  private static <T> void genericSingle(Class<T> param) { }
+
+  private static <T> void genericVarArgs(Class<T>... param) { }
+
+  private static <T> void genericArray(Class<T>[] param) { }
+
+  private static <T> void single(Class param) { }
+
+  private static <T> void varArgs(Class... param) { }
+
+  private static <T> void array(Class[] param) { }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestGroovyClass.groovy b/testData/src/pkg/TestGroovyClass.groovy
new file mode 100644
index 0000000..899aab2
--- /dev/null
+++ b/testData/src/pkg/TestGroovyClass.groovy
@@ -0,0 +1,13 @@
+package pkg
+
+import java.util.concurrent.Callable
+
+class TestGroovyClass {
+  static class Nested { }
+  class Inner { }
+
+  final Nested n = new Nested()
+  final Inner i = new Inner()
+  final Runnable r = { println("I'm runnable") }
+  final Callable<String> c = { "I'm callable" }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestGroovyTrait.groovy b/testData/src/pkg/TestGroovyTrait.groovy
new file mode 100644
index 0000000..5bbc203
--- /dev/null
+++ b/testData/src/pkg/TestGroovyTrait.groovy
@@ -0,0 +1,8 @@
+package pkg
+
+trait TestGroovyTrait {
+  def myField = 42
+  def myMethod() {
+    42
+  }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestIffSimplification.java b/testData/src/pkg/TestIffSimplification.java
new file mode 100644
index 0000000..5b87363
--- /dev/null
+++ b/testData/src/pkg/TestIffSimplification.java
@@ -0,0 +1,48 @@
+package pkg;
+
+import java.lang.Math;
+
+public class TestIffSimplification {
+    public int simpleIff(boolean status, int[] values) {
+        return status ? values[0] : values[1];
+    }
+
+    public int simpleIf(boolean status, int[] values) {
+        if (status) {
+            return values[0];
+        }
+        else {
+            return values[1];
+        }
+    }
+
+    public int nestedIf(boolean status, boolean condition, int[] values) {
+        if (status) {
+            if (condition) {
+                return values[2];
+            }
+            else {
+                return values[0];
+            }
+        }
+        else {
+            return values[1];
+        }
+    }
+
+    public int compareTo(int mc1, int mc2, byte csg1, byte csg2, double score1, double score2, int doc1, int doc2) {
+        if (mc1 != mc2) {
+            return mc1 < mc2 ? 1 : -1;
+        }
+
+        if (csg1 != csg2) {
+            return csg1 < csg2 ? 1 : -1;
+        }
+
+        if (Math.abs(score1 - score2) < 1e-6) {
+            return doc1 < doc2 ? -1 : 1;
+        }
+
+        return score1 < score2 ? 1 : -1;
+    }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestIllegalVarName.kt b/testData/src/pkg/TestIllegalVarName.kt
new file mode 100644
index 0000000..cf47c6e
--- /dev/null
+++ b/testData/src/pkg/TestIllegalVarName.kt
@@ -0,0 +1,7 @@
+package pkg
+
+class TestIllegalVarName {
+  fun m(`this`: String, `enum`: Int): String {
+    return `this` + '/' + `enum`
+  }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestInUse.java b/testData/src/pkg/TestInUse.java
new file mode 100644
index 0000000..115274d
--- /dev/null
+++ b/testData/src/pkg/TestInUse.java
@@ -0,0 +1,18 @@
+package pkg;
+
+public class TestInUse {
+  public int getInt() {
+    return 42;
+  }
+
+  protected int reuse() {
+    int i = 0, d = 0;
+    int result = 0;
+    do {
+      d = getInt();
+      result -= d;
+    }
+    while (++i < 10);
+    return result;
+  }
+}
diff --git a/testData/src/pkg/TestInner2.java b/testData/src/pkg/TestInner2.java
new file mode 100644
index 0000000..da402b9
--- /dev/null
+++ b/testData/src/pkg/TestInner2.java
@@ -0,0 +1,28 @@
+package pkg;
+
+class TestInner2 {
+  private TestInner2() {}
+  private TestInner2(int a) {}
+
+  class Another extends TestInner2 {
+    Another() {
+    }
+  }
+
+  static class AnotherStatic extends TestInner2 {
+    AnotherStatic() {
+    }
+  }
+
+  class Another2 extends TestInner2 {
+    Another2() {
+      super(2);
+    }
+  }
+
+  static class AnotherStatic2 extends TestInner2 {
+    AnotherStatic2() {
+      super(2);
+    }
+  }
+}
diff --git a/testData/src/pkg/TestInnerClassConstructor.java b/testData/src/pkg/TestInnerClassConstructor.java
index e42c319..ccc33ff 100644
--- a/testData/src/pkg/TestInnerClassConstructor.java
+++ b/testData/src/pkg/TestInnerClassConstructor.java
@@ -1,10 +1,14 @@
 package pkg;
 
 class TestInnerClassConstructor {
-  void m() {
+  void l() {
     new Inner("text");
   }
 
+  void m() {
+    new Another(3, 4);
+  }
+
   void n(String s) {
     System.out.println("n(): " + s);
   }
@@ -14,4 +18,10 @@ class TestInnerClassConstructor {
       n(s);
     }
   }
+
+  private class Another {
+    private Another(int a, int b) {
+      n(a + "+" + b);
+    }
+  }
 }
diff --git a/testData/src/pkg/TestInnerLocal.java b/testData/src/pkg/TestInnerLocal.java
index f0e9565..1d961fd 100644
--- a/testData/src/pkg/TestInnerLocal.java
+++ b/testData/src/pkg/TestInnerLocal.java
@@ -1,24 +1,10 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+package pkg;
 
 public class TestInnerLocal {
   public static void testStaticMethod() {
     class Inner {
       final String x;
-      public Inner(String x) {
+      public Inner(@Deprecated String x) {
         this.x = x;
       }
     }
@@ -30,7 +16,7 @@ public class TestInnerLocal {
   public void testMethod() {
     class Inner {
       final String x;
-      public Inner(String x) {
+      public Inner(@Deprecated String x) {
         this.x = x;
       }
     }
@@ -42,20 +28,20 @@ public class TestInnerLocal {
 
   class Inner1 {
     final String x;
-    public Inner1(String x) {
+    public Inner1(@Deprecated String x) {
       this.x = x;
     }
   }
 
   static class Inner1Static {
     final String x;
-    public Inner1Static(String x) {
+    public Inner1Static(@Deprecated String x) {
       this.x = x;
     }
 
     public static class Inner2Static {
       final String x;
-      public Inner2Static(String x) {
+      public Inner2Static(@Deprecated String x) {
         this.x = x;
       }
     }
diff --git a/testData/src/pkg/TestInnerLocalPkg.java b/testData/src/pkg/TestInnerLocalPkg.java
deleted file mode 100644
index cc3b2b4..0000000
--- a/testData/src/pkg/TestInnerLocalPkg.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package pkg;
-
-public class TestInnerLocalPkg {
-  public static void testStaticMethod() {
-    class Inner {
-      final String x;
-      public Inner(String x) {
-        this.x = x;
-      }
-    }
-    new Inner("test");
-    new Inner1Static("test");
-    new Inner1Static.Inner2Static("test");
-  }
-
-  public void testMethod() {
-    class Inner {
-      final String x;
-      public Inner(String x) {
-        this.x = x;
-      }
-    }
-    new Inner("test");
-    new Inner1Static("test");
-    new Inner1("test");
-    new Inner1Static.Inner2Static("test");
-  }
-
-  class Inner1 {
-    final String x;
-    public Inner1(String x) {
-      this.x = x;
-    }
-  }
-
-  static class Inner1Static {
-    final String x;
-    public Inner1Static(String x) {
-      this.x = x;
-    }
-
-    public static class Inner2Static {
-      final String x;
-      public Inner2Static(String x) {
-        this.x = x;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/testData/src/pkg/TestInnerSignature.java b/testData/src/pkg/TestInnerSignature.java
index d69f0b3..4da4162 100644
--- a/testData/src/pkg/TestInnerSignature.java
+++ b/testData/src/pkg/TestInnerSignature.java
@@ -1,25 +1,11 @@
-/*
- * Copyright 2000-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+package pkg;
 
 public class TestInnerSignature<A,B,C> {
   A a;
   B b;
   C c;
 
-  public TestInnerSignature(A a,B b,C c) {
+  public TestInnerSignature(A a, @Deprecated B b,C c) {
     this.a = a;
     this.b = b;
     this.c = c;
@@ -30,7 +16,7 @@ public class TestInnerSignature<A,B,C> {
     B b;
     C c;
 
-    public Inner(A a, B b, C c) {
+    public Inner(A a, @Deprecated B b, C c) {
       this.a = a;
       this.b = b;
       this.c = c;
@@ -42,7 +28,7 @@ public class TestInnerSignature<A,B,C> {
     B b;
     C c;
 
-    public InnerStatic(A a, B b, C c) {
+    public InnerStatic(A a, @Deprecated B b, C c) {
       this.a = a;
       this.b = b;
       this.c = c;
diff --git a/testData/src/pkg/TestInterfaceFields.java b/testData/src/pkg/TestInterfaceFields.java
new file mode 100644
index 0000000..e117258
--- /dev/null
+++ b/testData/src/pkg/TestInterfaceFields.java
@@ -0,0 +1,8 @@
+package pkg;
+
+import java.math.BigDecimal;
+
+public interface TestInterfaceFields {
+  BigDecimal BIG_ZERO = BigDecimal.ZERO;
+  int MAX_BYTE_VALUE = Byte.MAX_VALUE;
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestInterfaceMethods.java b/testData/src/pkg/TestInterfaceMethods.java
new file mode 100644
index 0000000..26f7d76
--- /dev/null
+++ b/testData/src/pkg/TestInterfaceMethods.java
@@ -0,0 +1,6 @@
+package pkg;
+
+public interface TestInterfaceMethods {
+  static void staticMethod() {}
+  default void defaultMethod() {}
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestInterfaceSuper.java b/testData/src/pkg/TestInterfaceSuper.java
new file mode 100644
index 0000000..02f7527
--- /dev/null
+++ b/testData/src/pkg/TestInterfaceSuper.java
@@ -0,0 +1,11 @@
+package pkg;
+
+public interface TestInterfaceSuper {
+  default void defaultMethod() {}
+
+  class Impl implements TestInterfaceSuper {
+    public void defaultMethod() {
+      TestInterfaceSuper.super.defaultMethod();
+    }
+  }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestKotlinConstructor.kt b/testData/src/pkg/TestKotlinConstructor.kt
new file mode 100644
index 0000000..cb9a363
--- /dev/null
+++ b/testData/src/pkg/TestKotlinConstructor.kt
@@ -0,0 +1,8 @@
+private fun foo(list: Collection<String>): List<Mapping> {
+    return list.map {
+        Mapping(it as String)
+    }.toList()
+}
+
+class Mapping(c: String) {
+}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC2_W.java b/testData/src/pkg/TestLambdaParams.java
similarity index 59%
rename from src/org/jetbrains/java/decompiler/code/optinstructions/LDC2_W.java
rename to testData/src/pkg/TestLambdaParams.java
index 6ba1964..bdb9279 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC2_W.java
+++ b/testData/src/pkg/TestLambdaParams.java
@@ -13,21 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.java.decompiler.code.optinstructions;
+package pkg;
 
-import org.jetbrains.java.decompiler.code.Instruction;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
 
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class LDC2_W extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_ldc2_w);
-    out.writeShort(getOperand(0));
-  }
-
-  public int length() {
-    return 3;
+public class TestLambdaParams {
+  public static void toCollection(Object collectionFactory) {
+    Class a = null;
+    Function f = r1 -> collectionFactory;
+    Function f1 = r1 -> a;
+    Function f2 = r1 -> r1;
   }
 }
diff --git a/testData/src/pkg/TestLineNumbersMatch.java b/testData/src/pkg/TestLineNumbersMatch.java
deleted file mode 100644
index d9d486a..0000000
--- a/testData/src/pkg/TestLineNumbersMatch.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Weird comment here.
- */
-package pkg;
-
-class TestLineNumbersMatch {
-  void m1(boolean b) {
-    if (b)
-      System.out.println("a");
-    else
-      System.out.println("b");
-  }
-
-  void m2() {
-    new Runnable() {
-      @Override
-      public void run() {
-        System.out.println("run with me");
-      }
-    }.run();
-  }
-}
\ No newline at end of file
diff --git a/testData/src/pkg/TestLocalsNames.java b/testData/src/pkg/TestLocalsNames.java
new file mode 100644
index 0000000..0049554
--- /dev/null
+++ b/testData/src/pkg/TestLocalsNames.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pkg;
+
+import java.io.File;
+
+public class TestLocalsNames {
+  private static void rename(File file, boolean recursively) {
+    if (file.isDirectory()) {
+      long start = System.currentTimeMillis();
+
+      File[] files = file.listFiles();
+      for (File s : files) {
+        File dest = new File(s.getAbsolutePath() + ".tmp");
+        assert s.renameTo(dest) : "unable to rename " + s + " to " + dest;
+      }
+
+      long elapsed = System.currentTimeMillis() - start;
+      System.out.println("took " + elapsed + "ms (" + elapsed / files.length + "ms per dir)");
+    }
+  }
+}
diff --git a/testData/src/pkg/TestLocalsSignature.java b/testData/src/pkg/TestLocalsSignature.java
new file mode 100644
index 0000000..9a52d54
--- /dev/null
+++ b/testData/src/pkg/TestLocalsSignature.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package pkg;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestLocalsSignature {
+  public static void main(String[] args) {
+    List<String> s = new ArrayList<String>();
+    s.add("xxx");
+  }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestMemberAnnotations.java b/testData/src/pkg/TestMemberAnnotations.java
new file mode 100644
index 0000000..b7c7da9
--- /dev/null
+++ b/testData/src/pkg/TestMemberAnnotations.java
@@ -0,0 +1,13 @@
+package pkg;
+
+import java.lang.annotation.*;
+
+class TestMemberAnnotations {
+  @Retention(RetentionPolicy.RUNTIME)
+  @interface A { String value() default ""; }
+
+  @A("const") public static final int CONST = 42;
+  @A("field") private int f;
+
+  @A("return") private int f(@A("arg") int i) { return i + f + CONST; }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestMethodParametersAttr.java b/testData/src/pkg/TestMethodParametersAttr.java
new file mode 100644
index 0000000..b98fc0b
--- /dev/null
+++ b/testData/src/pkg/TestMethodParametersAttr.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2000-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package decompiler;
+
+// compile with java 8: javap -parameters TestMethodParametersAttr.java
+public class TestMethodParametersAttr {
+  TestMethodParametersAttr(int p01) { }
+  void m1(int p02) { }
+  static void m2(int p03) { }
+
+  class C1 {
+    C1(int p11) { }
+    void m(int p12) { }
+  }
+
+  static class C2 {
+    C2(int p21) { }
+    void m1(int p22) { }
+    static void m2(int p23) { }
+  }
+
+  void local() {
+    class Local {
+      Local(int p31) { }
+      void m(int p32) { }
+    }
+  }
+
+  interface I1 {
+      void m1(int p41);
+      void m2(final int p42);
+  }
+
+  abstract class C3 {
+    abstract void m1(int p51);
+    abstract void m2(final int p52);
+  }
+
+  static abstract class C4 {
+    abstract void m1(int p51);
+    abstract void m2(final int p52);
+  }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestMethodReferenceLetterClass.java b/testData/src/pkg/TestMethodReferenceLetterClass.java
new file mode 100644
index 0000000..5f290d8
--- /dev/null
+++ b/testData/src/pkg/TestMethodReferenceLetterClass.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.function.Consumer;
+
+public class TestMethodReferenceLetterClass {
+  void boo() {
+    Consumer<R> foo = R::foo;
+  }
+}
+
+class R {
+  void foo() {}
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestMethodReferenceSameName.java b/testData/src/pkg/TestMethodReferenceSameName.java
new file mode 100644
index 0000000..58d18d3
--- /dev/null
+++ b/testData/src/pkg/TestMethodReferenceSameName.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class TestMethodReferenceSameName {
+  R1 r;
+
+  private void foo() {
+    ((Runnable)r::foo).run();
+  }
+
+  class R1 {
+    void foo() {}
+  }
+}
diff --git a/testData/src/pkg/TestMissingConstructorCallBad.jasm b/testData/src/pkg/TestMissingConstructorCallBad.jasm
new file mode 100644
index 0000000..ff6f4b6
--- /dev/null
+++ b/testData/src/pkg/TestMissingConstructorCallBad.jasm
@@ -0,0 +1,42 @@
+/**
+ * This code can be assembled with <a href="https://wiki.openjdk.java.net/display/CodeTools/asmtools">asmtools</a>
+ * using <code>asmtools jasm -g *.jasm</code> command line.
+ */
+package  pkg;
+
+super public class TestMissingConstructorCallBad
+	version 52:0
+{
+
+private Method "<init>":"()V"
+	stack 2 locals 1
+{
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		ldc	String "Nobody will see what we do here!";
+		invokevirtual	Method java/io/PrintStream.println:"(Ljava/lang/String;)V";
+
+        aload_0;
+		aconst_null;
+		invokespecial	Method "<init>":"(Ljava/lang/Object;)V";
+		return;
+}
+
+public static varargs Method main:"([Ljava/lang/String;)V"
+	stack 2 locals 2
+{
+		try t0;
+		new	class TestMissingConstructorCallBad;
+		dup;
+		invokespecial	Method "<init>":"()V";
+		pop;
+		endtry t0;
+		goto	L12;
+		catch t0 java/lang/Throwable;
+		stack_frame_type stack1;
+		stack_map class java/lang/Throwable;
+		astore_1;
+	L12:	stack_frame_type same;
+		return;
+}
+
+} // end Class TestMissingConstructorCallBad
diff --git a/testData/src/pkg/TestMissingConstructorCallGood.jasm b/testData/src/pkg/TestMissingConstructorCallGood.jasm
new file mode 100644
index 0000000..b08ac87
--- /dev/null
+++ b/testData/src/pkg/TestMissingConstructorCallGood.jasm
@@ -0,0 +1,50 @@
+/**
+ * This code can be assembled with <a href="https://wiki.openjdk.java.net/display/CodeTools/asmtools">asmtools</a>
+ * using <code>asmtools jasm -g *.jasm</code> command line.
+ */
+package  pkg;
+
+super public class TestMissingConstructorCallGood
+	version 52:0
+{
+
+private Method "<init>":"(Ljava/lang/Object;)V"
+	stack 1 locals 2
+{
+		aload_0;
+		invokespecial	Method java/lang/Object."<init>":"()V";
+		return;
+}
+
+private Method "<init>":"()V"
+	stack 2 locals 1
+{
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		ldc	String "Nobody will see what we do here!";
+		invokevirtual	Method java/io/PrintStream.println:"(Ljava/lang/String;)V";
+
+        aload_0;
+		aconst_null;
+		invokespecial	Method "<init>":"(Ljava/lang/Object;)V";
+		return;
+}
+
+public static varargs Method main:"([Ljava/lang/String;)V"
+	stack 2 locals 2
+{
+		try t0;
+		new	class TestMissingConstructorCallGood;
+		dup;
+		invokespecial	Method "<init>":"()V";
+		pop;
+		endtry t0;
+		goto	L12;
+		catch t0 java/lang/Throwable;
+		stack_frame_type stack1;
+		stack_map class java/lang/Throwable;
+		astore_1;
+	L12:	stack_frame_type same;
+		return;
+}
+
+} // end Class TestMissingConstructorCallGood
diff --git a/testData/src/pkg/TestNamedSuspendFun2.kt b/testData/src/pkg/TestNamedSuspendFun2.kt
new file mode 100644
index 0000000..670a91f
--- /dev/null
+++ b/testData/src/pkg/TestNamedSuspendFun2.kt
@@ -0,0 +1,14 @@
+
+suspend fun foo2(): Int {
+    while (true) {
+        try {
+            val x = bar()
+            if (x == 0) break
+        } finally {
+            bar()
+        }
+    }
+    return 1
+}
+
+suspend fun bar(): Int = 0
diff --git a/testData/src/pkg/TestParameterizedTypes.java b/testData/src/pkg/TestParameterizedTypes.java
new file mode 100644
index 0000000..490869e
--- /dev/null
+++ b/testData/src/pkg/TestParameterizedTypes.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pkg;
+
+public abstract class TestParameterizedTypes<P> {
+
+  public abstract class Inner<I> { }
+
+  abstract Inner<String> getUnspecificInner();
+
+  abstract TestParameterizedTypes<Number>.Inner<String> getSpecificInner();
+
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestPop2OneDoublePop2.jasm b/testData/src/pkg/TestPop2OneDoublePop2.jasm
new file mode 100644
index 0000000..6f7d5f6
--- /dev/null
+++ b/testData/src/pkg/TestPop2OneDoublePop2.jasm
@@ -0,0 +1,30 @@
+/**
+ * This code can be assembled with <a href="https://wiki.openjdk.java.net/display/CodeTools/asmtools">asmtools</a>
+ * using <code>asmtools jasm -g *.jasm</code> command line.
+ */
+package  pkg;
+
+super public class TestPop2OneDoublePop2
+	version 52:0
+{
+
+public Method "<init>":"()V"
+	stack 1 locals 1
+{
+		aload_0;
+		invokespecial	Method java/lang/Object."<init>":"()V";
+		return;
+}
+
+public static varargs Method main:"([Ljava/lang/String;)V"
+	stack 4 locals 1
+{
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		ldc int 1234567890;
+		ldc2_w double 3.14159265358D;
+		pop2;
+		invokevirtual	Method java/io/PrintStream.println:"(I)V";
+		return;
+}
+
+} // end Class TestPop2OneDoublePop2
diff --git a/testData/src/pkg/TestPop2OneLongPop2.jasm b/testData/src/pkg/TestPop2OneLongPop2.jasm
new file mode 100644
index 0000000..62d3179
--- /dev/null
+++ b/testData/src/pkg/TestPop2OneLongPop2.jasm
@@ -0,0 +1,30 @@
+/**
+ * This code can be assembled with <a href="https://wiki.openjdk.java.net/display/CodeTools/asmtools">asmtools</a>
+ * using <code>asmtools jasm -g *.jasm</code> command line.
+ */
+package  pkg;
+
+super public class TestPop2OneLongPop2
+	version 52:0
+{
+
+public Method "<init>":"()V"
+	stack 1 locals 1
+{
+		aload_0;
+		invokespecial	Method java/lang/Object."<init>":"()V";
+		return;
+}
+
+public static varargs Method main:"([Ljava/lang/String;)V"
+	stack 4 locals 1
+{
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		ldc int 1234567890;
+		ldc2_w long 0xCAFEBABE;
+		pop2;
+		invokevirtual	Method java/io/PrintStream.println:"(I)V";
+		return;
+}
+
+} // end Class TestPop2OneLongPop2
diff --git a/testData/src/pkg/TestPop2TwoIntPop2.jasm b/testData/src/pkg/TestPop2TwoIntPop2.jasm
new file mode 100644
index 0000000..4f2ce8e
--- /dev/null
+++ b/testData/src/pkg/TestPop2TwoIntPop2.jasm
@@ -0,0 +1,31 @@
+/**
+ * This code can be assembled with <a href="https://wiki.openjdk.java.net/display/CodeTools/asmtools">asmtools</a>
+ * using <code>asmtools jasm -g *.jasm</code> command line.
+ */
+package  pkg;
+
+super public class TestPop2TwoIntPop2
+	version 52:0
+{
+
+public Method "<init>":"()V"
+	stack 1 locals 1
+{
+		aload_0;
+		invokespecial	Method java/lang/Object."<init>":"()V";
+		return;
+}
+
+public static varargs Method main:"([Ljava/lang/String;)V"
+	stack 4 locals 1
+{
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		ldc int 1234567890;
+		ldc int 0xCAFE;
+		ldc int 0xBABE;
+		pop2;
+		invokevirtual	Method java/io/PrintStream.println:"(I)V";
+		return;
+}
+
+} // end Class TestPop2TwoIntPop2
diff --git a/testData/src/pkg/TestPop2TwoIntTwoPop.jasm b/testData/src/pkg/TestPop2TwoIntTwoPop.jasm
new file mode 100644
index 0000000..c9292da
--- /dev/null
+++ b/testData/src/pkg/TestPop2TwoIntTwoPop.jasm
@@ -0,0 +1,32 @@
+/**
+ * This code can be assembled with <a href="https://wiki.openjdk.java.net/display/CodeTools/asmtools">asmtools</a>
+ * using <code>asmtools jasm -g *.jasm</code> command line.
+ */
+package  pkg;
+
+super public class TestPop2TwoIntTwoPop
+	version 52:0
+{
+
+public Method "<init>":"()V"
+	stack 1 locals 1
+{
+		aload_0;
+		invokespecial	Method java/lang/Object."<init>":"()V";
+		return;
+}
+
+public static varargs Method main:"([Ljava/lang/String;)V"
+	stack 4 locals 1
+{
+		getstatic	Field java/lang/System.out:"Ljava/io/PrintStream;";
+		ldc int 1234567890;
+		ldc int 0xCAFE;
+		ldc int 0xBABE;
+		pop;
+		pop;
+		invokevirtual	Method java/io/PrintStream.println:"(I)V";
+		return;
+}
+
+} // end Class TestPop2TwoIntTwoPop
diff --git a/testData/src/pkg/TestPrimitiveNarrowing.java b/testData/src/pkg/TestPrimitiveNarrowing.java
new file mode 100644
index 0000000..672ceb8
--- /dev/null
+++ b/testData/src/pkg/TestPrimitiveNarrowing.java
@@ -0,0 +1,24 @@
+package pkg;
+
+class TestPrimitiveNarrowing {
+
+  TestPrimitiveNarrowing(Short value) {
+  }
+
+  static void invocations() {
+    withInteger(null);
+    withShort(null);
+    withByte(null);
+    new TestPrimitiveNarrowing(null);
+  }
+
+  static void withByte(Byte defaultValue) {
+  }
+
+  static void withInteger(Integer defaultValue) {
+  }
+
+  static void withShort(Short defaultValue) {
+  }
+
+}
diff --git a/testData/src/pkg/TestPrimitives.java b/testData/src/pkg/TestPrimitives.java
new file mode 100644
index 0000000..3630252
--- /dev/null
+++ b/testData/src/pkg/TestPrimitives.java
@@ -0,0 +1,180 @@
+package pkg;
+
+import java.util.*;
+
+public class TestPrimitives {
+
+  public void printAll() {
+    printBoolean(true);
+    printByte((byte) 123);
+    printShort((short) 257);
+    printInt(123);
+    printLong(123L);
+    printFloat(1.23F);
+    printDouble(1.23);
+    printChar('Z');
+
+    printBooleanBoxed(true);
+    printByteBoxed((byte) 123);
+    printShortBoxed((short) 257);
+    printIntBoxed(1);
+    printIntBoxed(40_000);
+    printLongBoxed(123L);
+    printFloatBoxed(1.23F);
+    printDoubleBoxed(1.23);
+    printCharBoxed('Z');
+
+    printBoolean(Boolean.valueOf("true"));
+    printByte(Byte.valueOf("123"));
+    printShort(Short.valueOf("257"));
+    printInt(Integer.valueOf("123"));
+    printLong(Long.valueOf("123"));
+    printFloat(Float.valueOf("1.23"));
+    printDouble(Double.valueOf("1.23"));
+    printChar(new Character('Z'));
+
+    printInt(getInteger());
+    printChar(getCharacter());
+
+    System.out.printf("%b, %d, %d, %d, %c, %d", true, 1, 213, 40_000, 'c', 42L);
+    System.out.printf("%b, %d, %d, %d", getBoolean(), getByte(), getShort(), getInt());
+
+    new TestPrimitives(false, (byte) 123, (short) 257, 40_000, 123L, 3.14f, 1.618, 'A');
+    new TestPrimitives('A', 1.618, 3.14f, 123L, 40_000, (short) 257, (byte) 123, false);
+    new TestPrimitives(Boolean.valueOf("false"), Byte.valueOf("123"), Short.valueOf("257"), Integer.valueOf("40000"), Long.valueOf("123"),
+                       Float.valueOf("3.14"), Double.valueOf("1.618"), new Character('A'));
+  }
+
+  private TestPrimitives(boolean bool, byte b, short s, int i, long l, float f, double d, char c) {
+    System.out.printf("%b, %d, %d, %d, %d, %.2f, %.2f, %c", bool, b, s, i, l, f, d, c);
+  }
+
+  private TestPrimitives(Character c, Double d, Float f, Long l, Integer i, Short s, Byte b, Boolean bool) {
+    System.out.printf("%b, %d, %d, %d, %d, %.2f, %.2f, %c", bool, b, s, i, l, f, d, c);
+  }
+
+  public void printBoolean(boolean b) {
+    System.out.printf("%b", b);
+  }
+
+  public void printByte(byte b) {
+    System.out.printf("%d", b);
+  }
+
+  public void printShort(short s) {
+    System.out.printf("%d", s);
+  }
+
+  public void printInt(int i) {
+    System.out.printf("%d", i);
+  }
+
+  public void printLong(long l) {
+    System.out.printf("%d", l);
+  }
+
+  public void printFloat(float f) {
+    System.out.printf("%f", f);
+  }
+
+  public void printDouble(double d) {
+    System.out.printf("%f", d);
+  }
+
+  public void printChar(char c) {
+    System.out.printf("%c", c);
+  }
+
+
+  public void printBooleanBoxed(Boolean b) {
+    System.out.printf("%b", b);
+  }
+
+  public void printByteBoxed(Byte b) {
+    System.out.printf("%d", b);
+  }
+
+  public void printShortBoxed(Short s) {
+    System.out.printf("%d", s);
+  }
+
+  public void printIntBoxed(Integer i) {
+    System.out.printf("%d", i);
+  }
+
+  public void printLongBoxed(Long l) {
+    System.out.printf("%d", l);
+  }
+
+  public void printFloatBoxed(Float f) {
+    System.out.printf("%f", f);
+  }
+
+  public void printDoubleBoxed(Double d) {
+    System.out.printf("%f", d);
+  }
+
+  public void printCharBoxed(Character c) {
+    System.out.printf("%c", c);
+  }
+
+
+  public boolean getBoolean() {
+    return false;
+  }
+
+  public byte getByte() {
+    return (byte) 128;
+  }
+
+  public short getShort() {
+    return (short) 32768;
+  }
+
+  public int getInt() {
+    return 42;
+  }
+
+  public Integer getInteger() {
+    return 40_000;
+  }
+
+  public Character getCharacter() {
+    return 'Z';
+  }
+
+  public void printNarrowed() {
+    printByte((byte)getInt());
+    printShort((short)getInt());
+  }
+
+  public void constructor() {
+    new Byte((byte)1);
+  }
+
+  private boolean compare(char c) {
+    boolean res = (c > -1);
+    res = (c > 0);
+    res = (c > 1);
+    res = (c > '\b');
+    res = (c > '\t');
+    res = (c > '\n');
+    res = (c > '\f');
+    res = (c > '\r');
+    res = (c > ' ');
+    res = (c > 'a');
+    res = (c > 'Z');
+    res = (c > 127);
+    res = (c > 255);
+    return res;
+  }
+
+  void testAutoBoxingCallRequired(boolean value) {
+    Boolean.valueOf(value).hashCode();
+  }
+
+  void testCastRequired() {
+    HashMap<String, Byte> map = new HashMap<String, Byte>();
+    map.put("test", (byte) 0);
+  }
+}
diff --git a/testData/src/pkg/TestPrivateEmptyConstructor.java b/testData/src/pkg/TestPrivateEmptyConstructor.java
new file mode 100644
index 0000000..3323c93
--- /dev/null
+++ b/testData/src/pkg/TestPrivateEmptyConstructor.java
@@ -0,0 +1,9 @@
+package pkg;
+
+public final class TestPrivateEmptyConstructor {
+   private TestPrivateEmptyConstructor() {}
+
+   public final void test() {
+		System.out.println("test");
+   }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestShadowing.java b/testData/src/pkg/TestShadowing.java
new file mode 100644
index 0000000..8539778
--- /dev/null
+++ b/testData/src/pkg/TestShadowing.java
@@ -0,0 +1,12 @@
+package pkg;
+
+import java.util.Calendar;
+
+class TestShadowing extends TestShadowingSuperClass {
+  ext.Shadow.B instanceOfB = new ext.Shadow.B();
+  Calendar.Builder calBuilder = new Calendar.Builder();
+}
+
+class TestShadowingSuperClass {
+  static class Builder { }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestStaticNameClash.java b/testData/src/pkg/TestStaticNameClash.java
new file mode 100644
index 0000000..5f5a08f
--- /dev/null
+++ b/testData/src/pkg/TestStaticNameClash.java
@@ -0,0 +1,11 @@
+package pkg;
+
+public class TestStaticNameClash {
+
+    public static String property;
+
+    public static void setProperty(final String property) {
+        TestStaticNameClash.property = property;
+    }
+
+}
diff --git a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC_W.java b/testData/src/pkg/TestStringConcat.java
similarity index 59%
rename from src/org/jetbrains/java/decompiler/code/optinstructions/LDC_W.java
rename to testData/src/pkg/TestStringConcat.java
index 71e5fe0..1a77677 100644
--- a/src/org/jetbrains/java/decompiler/code/optinstructions/LDC_W.java
+++ b/testData/src/pkg/TestStringConcat.java
@@ -13,21 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jetbrains.java.decompiler.code.optinstructions;
+package pkg;
 
-import org.jetbrains.java.decompiler.code.Instruction;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public class LDC_W extends Instruction {
-
-  public void writeToStream(DataOutputStream out, int offset) throws IOException {
-    out.writeByte(opc_ldc_w);
-    out.writeShort(getOperand(0));
+public class TestStringConcat {
+  public String test1(String prefix, int a) {
+    return prefix + a;
   }
 
-  public int length() {
-    return 3;
+  public String test2(String var, int b, Object c) {
+    return "(" + var + "-" + b + "---" + c + ")";
   }
-}
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestStringLiterals.java b/testData/src/pkg/TestStringLiterals.java
new file mode 100644
index 0000000..ebefa32
--- /dev/null
+++ b/testData/src/pkg/TestStringLiterals.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pkg;
+
+public class TestStringLiterals {
+  public static void main(String[] args) {
+    String a = "abc\b\t\n\f\r\"'\\def";
+    char chars[] = {'\b', '\t', '\n', '\f', '\r', '"', '\'', '\\'};
+    System.out.println(a);
+    System.out.println(chars);
+  }
+}
diff --git a/testData/src/pkg/TestSuperInner.java b/testData/src/pkg/TestSuperInner.java
new file mode 100644
index 0000000..b5251ba
--- /dev/null
+++ b/testData/src/pkg/TestSuperInner.java
@@ -0,0 +1,5 @@
+package pkg;
+
+class TestSuperInner extends TestSuperInnerBase {
+  protected abstract class Inner2 extends Inner { }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestSuperInnerBase.java b/testData/src/pkg/TestSuperInnerBase.java
new file mode 100644
index 0000000..e53ec09
--- /dev/null
+++ b/testData/src/pkg/TestSuperInnerBase.java
@@ -0,0 +1,7 @@
+package pkg;
+
+class TestSuperInnerBase {
+  protected abstract class Inner {
+    protected Inner() { }
+  }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestSuspendLambda.kt b/testData/src/pkg/TestSuspendLambda.kt
new file mode 100644
index 0000000..8b80110
--- /dev/null
+++ b/testData/src/pkg/TestSuspendLambda.kt
@@ -0,0 +1,5 @@
+package pkg
+
+val sl1: suspend () -> Unit = {
+    println("SL1")
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestSwitchOnEnum.java b/testData/src/pkg/TestSwitchOnEnum.java
new file mode 100644
index 0000000..0ea59ec
--- /dev/null
+++ b/testData/src/pkg/TestSwitchOnEnum.java
@@ -0,0 +1,48 @@
+package pkg;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * This illustrates a bug in fernflower as of 20170421. Decompiled output of this class does not compile back.
+ */
+public class TestSwitchOnEnum {
+
+  int myInt;
+
+  public int testSOE(TimeUnit t) {
+    // This creates anonymous SwitchMap inner class.
+    switch (t) {
+      case MICROSECONDS:
+        return 2;
+      case SECONDS:
+        return 1;
+    }
+    return 0;
+  }
+
+  static class Example {
+
+    enum A { A1, A2}
+
+    enum B { B1, B2}
+
+    void test(A a, B b){
+      switch (a){
+        case A1:
+          System.out.println("A1");
+          break;
+        case A2:
+          System.out.println("A2");
+          break;
+      }
+      switch (b){
+        case B1:
+          System.out.println("B1");
+          break;
+        case B2:
+          System.out.println("B2");
+          break;
+      }
+    }
+  }
+}
diff --git a/testData/src/pkg/TestSwitchOnStrings.java b/testData/src/pkg/TestSwitchOnStrings.java
new file mode 100644
index 0000000..cd120e8
--- /dev/null
+++ b/testData/src/pkg/TestSwitchOnStrings.java
@@ -0,0 +1,13 @@
+package pkg;
+
+public class TestSwitchOnStrings {
+  public int testSOE(String s) {
+    switch (s) {
+      case "xxx":
+        return 2;
+      case "yyy":
+        return 1;
+    }
+    return 0;
+  }
+}
diff --git a/testData/src/pkg/TestSynchronizedUnprotected.kt b/testData/src/pkg/TestSynchronizedUnprotected.kt
new file mode 100644
index 0000000..59d8c6b
--- /dev/null
+++ b/testData/src/pkg/TestSynchronizedUnprotected.kt
@@ -0,0 +1,9 @@
+package pkg
+
+class TestSynchronizedUnprotected {
+    fun test() {
+        synchronized(this) {
+            println("Boom")
+        }
+    }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/TestSyntheticAccess.java b/testData/src/pkg/TestSyntheticAccess.java
new file mode 100644
index 0000000..5ef41e8
--- /dev/null
+++ b/testData/src/pkg/TestSyntheticAccess.java
@@ -0,0 +1,40 @@
+package pkg;
+
+class TestSyntheticAccess {
+
+  private static int s;
+  private int i;
+
+  private class Incrementer {
+    void orI() {
+      i|=1;
+    }
+
+    void incrementI() {
+      i++;
+    }
+
+    void decrementI() {
+      --i;
+    }
+
+    void incrementS() {
+      ++s;
+    }
+
+    void decrementS() {
+      s--;
+    }
+  }
+
+  private class Assigner {
+    void assignI(int newValue) {
+      i = newValue;
+    }
+
+    void assignS(int newValue) {
+      s = newValue;
+    }
+  }
+
+}
diff --git a/testData/src/pkg/TestUnionType.java b/testData/src/pkg/TestUnionType.java
new file mode 100644
index 0000000..13c2bf7
--- /dev/null
+++ b/testData/src/pkg/TestUnionType.java
@@ -0,0 +1,10 @@
+package pkg;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+public interface TestUnionType {
+  public static Comparator comparingInt() {
+    return (Comparator & Serializable)(c1, c2) -> 1;
+  }
+}
diff --git a/testData/src/pkg/TestVarArgCalls.java b/testData/src/pkg/TestVarArgCalls.java
new file mode 100644
index 0000000..61c199c
--- /dev/null
+++ b/testData/src/pkg/TestVarArgCalls.java
@@ -0,0 +1,29 @@
+package pkg;
+
+public class TestVarArgCalls {
+  public void doSmth() {
+    printAll("Test");
+    printAll("Test: %s", "abc");
+    printAll("Test: %s - %s", "abc", "DEF");
+
+    printComplex("Test");
+    printComplex("Test: %[0]s", new String[] { "abc" });
+    printComplex("Test: %[0]s - %[0]s", new String[] { "abc" }, new String[] { "DEF" });
+
+    String.format("Test");
+    String.format("Test: %d", 123);
+    String.format("Test: %d - %s", 123, "DEF");
+
+    Object[] data = { "Hello" };
+    String.format("Test: %s", (Object) data);
+    String.format("Test: %s", (Object[]) data);
+  }
+
+  public void printAll(String fmt, String... params) {
+    System.out.println(String.format(fmt, (Object[]) params));
+  }
+
+  public void printComplex(String fmt, String[]... params) {
+    System.out.println(String.format(fmt, (Object[]) params));
+  }
+}
diff --git a/testData/src/pkg/TypeAnnotations.java b/testData/src/pkg/TypeAnnotations.java
new file mode 100644
index 0000000..0760dde
--- /dev/null
+++ b/testData/src/pkg/TypeAnnotations.java
@@ -0,0 +1,22 @@
+package pkg;
+
+import java.lang.annotation.*;
+import java.util.*;
+
+class TypeAnnotations {
+  @Target(ElementType.TYPE_USE)
+  @interface TA { String value(); }
+
+  @Target({ElementType.FIELD, ElementType.TYPE_USE})
+  @interface MixA { String value(); }
+
+  private @TA("field type") String f1;
+
+  private @MixA("field and type") String f2;
+
+  @TA("return type") int m1() {
+    return 42;
+  }
+
+  void m2(@TA("parameter") int i) { }
+}
\ No newline at end of file
diff --git a/testData/src/pkg/package-info.java b/testData/src/pkg/package-info.java
new file mode 100644
index 0000000..d665652
--- /dev/null
+++ b/testData/src/pkg/package-info.java
@@ -0,0 +1,2 @@
+@jdk.Exported
+package pkg;