diff --git a/com.ibm.wala.core.tests/build.xml b/com.ibm.wala.core.tests/build.xml
index 4d0a0f471..8dc73900f 100644
--- a/com.ibm.wala.core.tests/build.xml
+++ b/com.ibm.wala.core.tests/build.xml
@@ -1,218 +1,223 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="com.ibm.wala.core.tests" default="build.jars" basedir=".">
 
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="com.ibm.wala.core.tests"/>
-	<property name="bundleVersion" value="1.1.3.200805291132"/>
+	<property name="basews" value="${ws}" />
+	<property name="baseos" value="${os}" />
+	<property name="basearch" value="${arch}" />
+	<property name="basenl" value="${nl}" />
+	<property name="bundleId" value="com.ibm.wala.core.tests" />
+	<property name="bundleVersion" value="1.1.3.200805291132" />
 
 
 
 	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="true"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="javacSource" value="1.5"/>
-	<property name="javacTarget" value="1.5"/>
+	<property name="javacFailOnError" value="true" />
+	<property name="javacDebugInfo" value="on" />
+	<property name="javacVerbose" value="false" />
+	<property name="logExtension" value=".log" />
+	<property name="compilerArg" value="" />
+	<property name="javacSource" value="1.5" />
+	<property name="javacTarget" value="1.5" />
 	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
+		<os family="mac" />
 	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
+	<property name="dir_bootclasspath" value="${java.home}/lib" />
 	<path id="path_bootclasspath">
 		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
+			<include name="*.jar" />
 		</fileset>
 	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
+	<property name="bootclasspath" refid="path_bootclasspath" />
+	<property name="bundleJavacSource" value="${javacSource}" />
+	<property name="bundleJavacTarget" value="${javacTarget}" />
+	<property name="bundleBootClasspath" value="${bootclasspath}" />
 
 	<!-- SJF modifications to support junit -->
 	<path id="@dot.classpath">
-			<pathelement path="../com.ibm.wala.core/bin/"/>
-			<pathelement path="../com.ibm.wala.core/@dot"/>
-			<pathelement path="../com.ibm.wala.shrike/bin/"/>
-			<pathelement path="../com.ibm.wala.shrike/@dot"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.resources_3.3.1.R33x_v20080205.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.resources.compatibility_3.2.100.v20070502.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.ant.core_3.1.200.v20070522.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.variables_3.2.0.v20070426.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime_3.3.100.v20070530.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.osgi_3.3.2.R33x_v20080105.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.equinox.common_3.3.0.v20070426.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.jobs_3.3.1.R33x_v20070709.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316/runtime_registry_compatibility.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.equinox.registry_3.3.1.R33x_v20070802.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.equinox.preferences_3.2.101.R33x_v20080117.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316/@dot"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.contenttype_3.2.100.v20070319.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime.compatibility.auth_3.2.100.v20070502.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.equinox.app_1.0.1.R33x_v20070828.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.osgi.services_3.1.200.v20070605.jar"/>
-			<pathelement path="../../../eclipse/plugins/javax.servlet_2.4.0.v200706111738.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.expressions_3.3.0.v20070606-0010.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.filesystem_1.1.0.v20070606.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.jface_3.3.2.M20080207-0800.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.swt_3.3.2.v3349d.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.swt.gtk.linux.x86_3.3.2.v3349.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.commands_3.3.0.I20070605-0010.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.jdt.core_3.3.3.v_793_R33x.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.jdt.compiler.tool_1.0.1.v_793_R33x.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20071002-2100.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.text_3.3.0.v20070606-0010.jar"/>
-			<pathelement path="../../../eclipse/plugins/com.ibm.icu_3.6.1.v20070906.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.team.core_3.3.1.r33x_20080128.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.ui_3.3.1.M20071128-0800.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.ui.workbench_3.3.2.M20080207-0800.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.ui.workbench.compatibility_3.2.0.I20070319-0010/@dot"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.ui.workbench.compatibility_3.2.0.I20070319-0010/compatibility.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.help_3.3.2.v20071126_33x.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.jface.databinding_1.1.1.M20080207-0800.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.databinding_1.0.1.M20070822-0800.jar"/>
-			<pathelement path="../com.ibm.wala.core.testdata/bin/"/>
-			<pathelement path="../com.ibm.wala.core.testdata/@dot"/>
-			<pathelement path="../../../eclipse/plugins/org.junit_3.8.2.v200706111738/junit.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.ui.ide_3.3.2.M20080207-0800.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.ui.views_3.2.101.M20080207-0800.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.update.configurator_3.2.101.R33x_v20070810.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.update.core_3.2.101.R33x_v20070911.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.update.core.linux_3.2.0.v20070615.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.core.net_1.0.1.r33x_20070709.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.update.ui_3.2.100.v20070615.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.ui.forms_3.3.0.v20070511.jar"/>
-			<pathelement path="../../../eclipse/plugins/org.eclipse.jface.text_3.3.2.r332_20071017-0800.jar"/>
+		<pathelement path="../com.ibm.wala.core/bin/" />
+		<pathelement path="../com.ibm.wala.core/@dot" />
+		<pathelement path="../com.ibm.wala.shrike/bin/" />
+		<pathelement path="../com.ibm.wala.shrike/@dot" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.core.resources_3.3.1.R33x_v20080205.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.core.resources.compatibility_3.2.100.v20070502.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.ant.core_3.1.200.v20070522.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.core.variables_3.2.0.v20070426.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime_3.3.100.v20070530.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.osgi_3.3.2.R33x_v20080105.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.equinox.common_3.3.0.v20070426.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.core.jobs_3.3.1.R33x_v20070709.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316/runtime_registry_compatibility.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.equinox.registry_3.3.1.R33x_v20070802.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.equinox.preferences_3.2.101.R33x_v20080117.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316/@dot" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.core.contenttype_3.2.100.v20070319.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.core.runtime.compatibility.auth_3.2.100.v20070502.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.equinox.app_1.0.1.R33x_v20070828.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.osgi.services_3.1.200.v20070605.jar" />
+		<pathelement path="../../../eclipse/plugins/javax.servlet_2.4.0.v200706111738.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.core.expressions_3.3.0.v20070606-0010.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.core.filesystem_1.1.0.v20070606.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.core.filesystem.linux.x86_1.1.0.v20070416.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.jface_3.3.2.M20080207-0800.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.swt_3.3.2.v3349d.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.swt.gtk.linux.x86_3.3.2.v3349.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.core.commands_3.3.0.I20070605-0010.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.jdt.core_3.3.3.v_793_R33x.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.jdt.compiler.tool_1.0.1.v_793_R33x.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.jdt.compiler.apt_1.0.1.R33x_v20071002-2100.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.text_3.3.0.v20070606-0010.jar" />
+		<pathelement path="../../../eclipse/plugins/com.ibm.icu_3.6.1.v20070906.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.team.core_3.3.1.r33x_20080128.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.ui_3.3.1.M20071128-0800.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.ui.workbench_3.3.2.M20080207-0800.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.ui.workbench.compatibility_3.2.0.I20070319-0010/@dot" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.ui.workbench.compatibility_3.2.0.I20070319-0010/compatibility.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.help_3.3.2.v20071126_33x.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.jface.databinding_1.1.1.M20080207-0800.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.core.databinding_1.0.1.M20070822-0800.jar" />
+		<pathelement path="../com.ibm.wala.core.testdata/bin/" />
+		<pathelement path="../com.ibm.wala.core.testdata/@dot" />
+		<pathelement path="../../../eclipse/plugins/org.junit_3.8.2.v200706111738/junit.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.ui.ide_3.3.2.M20080207-0800.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.ui.views_3.2.101.M20080207-0800.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.update.configurator_3.2.101.R33x_v20070810.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.update.core_3.2.101.R33x_v20070911.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.update.core.linux_3.2.0.v20070615.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.core.net_1.0.1.r33x_20070709.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.update.ui_3.2.100.v20070615.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.ui.forms_3.3.0.v20070511.jar" />
+		<pathelement path="../../../eclipse/plugins/org.eclipse.jface.text_3.3.2.r332_20071017-0800.jar" />
 	</path>
 
-        <property name="junit.dir" value ="junit-results"/>	
-	
-	<target name="runtests" depends="clean build.update.jar" description="run junit tests for com.ibm.wala.core.tests">
-	  <delete dir="${junit.dir}"/>
-   	  <mkdir dir="${junit.dir}"/>
-          <junit fork="yes" errorProperty="test.failed" failureProperty="test.failed">
-	     <jvmarg value="-Xmx800M" />
-	     <jvmarg value="-ea" />
-	     <jvmarg value="-Dcom.ibm.wala.junit.profiler=short" />
-	     <classpath> 
-		<path refid="@dot.classpath" />
-		<pathelement path="@dot" />
-		<pathelement path="../com.ibm.wala.core/dat" />
-		<pathelement path="../com.ibm.wala.core.testdata/bin" />
-		<pathelement path="../com.ibm.wala.core.testdata/src" />
-		<pathelement path="../com.ibm.wala.core.testdata/@dot" />
-             </classpath>
+	<property name="junit.dir" value="junit-results" />
 
-	     <batchtest todir="${junit.dir}">
-		<!-- zipfileset src="com.ibm.wala.core.tests_1.1.3.200805291132.jar" -->
-		<fileset dir="@dot">	
-                   <include name="**/*Test*.class"/>
-		   <exclude name="**/*$*.class"/>
-		   <exclude name="**/*TestUtil.class"/>
-		</fileset>
-	     </batchtest>
+	<target name="runtests" depends="clean,build.update.jar" description="run junit tests for com.ibm.wala.core.tests">
+		<delete dir="${junit.dir}" />
+		<mkdir dir="${junit.dir}" />
+		<junit fork="yes" errorProperty="test.failed" failureProperty="test.failed">
+			<jvmarg value="-Xmx800M" />
+			<jvmarg value="-ea" />
+			<!-- jvmarg value="-Dcom.ibm.wala.junit.profiler=short" -->
+			<classpath>
+				<path refid="@dot.classpath" />
+				<pathelement path="@dot" />
+				<pathelement path="../com.ibm.wala.core/dat" />
+				<pathelement path="../com.ibm.wala.core.testdata/bin" />
+				<pathelement path="../com.ibm.wala.core.testdata/src" />
+				<pathelement path="../com.ibm.wala.core.testdata/@dot" />
+			</classpath>
 
-             <formatter type="plain" />
- 	     <formatter type="xml" />
-          </junit>
-	  <fail message="Tests failed: check test reports." if="test.failed" />
-        </target>
+			<batchtest todir="${junit.dir}">
+				<!-- zipfileset src="com.ibm.wala.core.tests_1.1.3.200805291132.jar" -->
+				<fileset dir="@dot">
+					<include name="**/*Test*.class" />
+					<exclude name="**/*$*.class" />
+					<exclude name="**/*TestUtil.class" />
+					<exclude name="**/*TestInfo.class" />
+					<exclude name="**/*TestConstants.class" />
+					<exclude name="**/*WalaTestCase.class" />
+					<exclude name="**/*AbstractPtrTest.class" />
+					<exclude name="**/*TestAgainstSimpleDriver.class" />
+				</fileset>
+			</batchtest>
+
+			<formatter type="plain" />
+			<formatter type="xml" />
+		</junit>
+		<fail message="Tests failed: check test reports." if="test.failed" />
+	</target>
 
 
 	<target name="init" depends="properties">
 		<condition property="pluginTemp" value="${buildTempFolder}/plugins">
-			<isset property="buildTempFolder"/>
+			<isset property="buildTempFolder" />
 		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
+		<property name="pluginTemp" value="${basedir}" />
 		<condition property="build.result.folder" value="${pluginTemp}/com.ibm.wala.core.tests_1.1.3.200805291132">
-			<isset property="buildTempFolder"/>
+			<isset property="buildTempFolder" />
 		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
+		<property name="build.result.folder" value="${basedir}" />
+		<property name="temp.folder" value="${basedir}/temp.folder" />
+		<property name="plugin.destination" value="${basedir}" />
 	</target>
 
 	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
 
 	</target>
 
 	<target name="build.update.jar" depends="init" description="Build the plug-in: com.ibm.wala.core.tests for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
+		<delete dir="${temp.folder}" />
+		<mkdir dir="${temp.folder}" />
+		<antcall target="build.jars" />
 		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
+			<param name="destination.temp.folder" value="${temp.folder}/" />
 		</antcall>
-		<jar destfile="${plugin.destination}/com.ibm.wala.core.tests_1.1.3.200805291132.jar" basedir="${temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
+		<jar destfile="${plugin.destination}/com.ibm.wala.core.tests_1.1.3.200805291132.jar" basedir="${temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" filesetmanifest="merge" />
+		<delete dir="${temp.folder}" />
 	</target>
 
 	<target name="@dot" depends="init" unless="@dot" description="Create jar: com.ibm.wala.core.tests @dot.">
-		<delete dir="${temp.folder}/@dot.bin"/>
-		<mkdir dir="${temp.folder}/@dot.bin"/>
+		<delete dir="${temp.folder}/@dot.bin" />
+		<mkdir dir="${temp.folder}/@dot.bin" />
 		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/@dot.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
+		<javac destdir="${temp.folder}/@dot.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}">
+			<compilerarg line="${compilerArg}" compiler="${build.compiler}" />
 			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<src path="dat/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-			<compilerarg line="-log '${temp.folder}/@dot.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+			<src path="src/" />
+			<src path="dat/" />
+			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />
+			<compilerarg line="-log '${temp.folder}/@dot.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />
 		</javac>
 		<!-- Copy necessary resources -->
 		<copy todir="${temp.folder}/@dot.bin" failonerror="true" overwrite="false">
 			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
+				<exclude name="**/*.java" />
+				<exclude name="**/package.htm*" />
 			</fileset>
 			<fileset dir="dat/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
+				<exclude name="**/*.java" />
+				<exclude name="**/package.htm*" />
 			</fileset>
 		</copy>
-		<mkdir dir="${build.result.folder}"/>
+		<mkdir dir="${build.result.folder}" />
 		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
 			<fileset dir="${temp.folder}/@dot.bin">
 			</fileset>
 		</copy>
-		<delete dir="${temp.folder}/@dot.bin"/>
+		<delete dir="${temp.folder}/@dot.bin" />
 	</target>
 
 	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
+		<mkdir dir="${build.result.folder}" />
 		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
 			<fileset dir="src/">
-				<include name="**/*.java"/>
+				<include name="**/*.java" />
 			</fileset>
 			<fileset dir="dat/">
-				<include name="**/*.java"/>
+				<include name="**/*.java" />
 			</fileset>
 		</zip>
 	</target>
 
 	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: com.ibm.wala.core.tests.">
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
+		<available property="@dot" file="${build.result.folder}/@dot" />
+		<antcall target="@dot" />
 	</target>
 
 	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
+		<available property="src.zip" file="${build.result.folder}/src.zip" />
+		<antcall target="src.zip" />
 	</target>
 
 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132"/>
+		<mkdir dir="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" />
 		<copy todir="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" failonerror="true" overwrite="false">
 			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.xml"/>
-				<include name="plugin.properties"/>
+				<include name="META-INF/" />
+				<include name="plugin.xml" />
+				<include name="plugin.properties" />
 			</fileset>
 		</copy>
 		<!-- eclipse.versionReplacer path="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" version="1.1.3.200805291132" -->
@@ -222,50 +227,50 @@
 	</target>
 
 	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" failonerror="false" overwrite="false"/>
+		<mkdir dir="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" />
+		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" failonerror="false" overwrite="false" />
 	</target>
 
 	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132"/>
+		<mkdir dir="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" />
 		<copy todir="${destination.temp.folder}/com.ibm.wala.core.tests_1.1.3.200805291132" failonerror="false" overwrite="false">
 			<fileset dir="${temp.folder}">
-				<include name="@dot.bin${logExtension}"/>
+				<include name="@dot.bin${logExtension}" />
 			</fileset>
 		</copy>
 	</target>
 
 	<target name="clean" depends="init" description="Clean the plug-in: com.ibm.wala.core.tests of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/com.ibm.wala.core.tests_1.1.3.200805291132.jar"/>
-		<delete file="${plugin.destination}/com.ibm.wala.core.tests_1.1.3.200805291132.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete dir="${junit.dir}"/>
+		<delete dir="${build.result.folder}/@dot" />
+		<delete file="${build.result.folder}/src.zip" />
+		<delete file="${plugin.destination}/com.ibm.wala.core.tests_1.1.3.200805291132.jar" />
+		<delete file="${plugin.destination}/com.ibm.wala.core.tests_1.1.3.200805291132.zip" />
+		<delete dir="${temp.folder}" />
+		<delete dir="${junit.dir}" />
 	</target>
 
 	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/snugglebug/sjf/workspace/com.ibm.wala.core.tests" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
+		<eclipse.convertPath fileSystemPath="/home/snugglebug/sjf/workspace/com.ibm.wala.core.tests" property="resourcePath" />
+		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite" />
 	</target>
 
 	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: com.ibm.wala.core.tests.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
+		<delete dir="${temp.folder}" />
+		<mkdir dir="${temp.folder}" />
+		<antcall target="build.jars" />
+		<antcall target="build.sources" />
 		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
+			<param name="destination.temp.folder" value="${temp.folder}/" />
 		</antcall>
 		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
+			<param name="destination.temp.folder" value="${temp.folder}/" />
 		</antcall>
 		<delete>
 			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
+				<include name="**/*.bin${logExtension}" />
 			</fileset>
 		</delete>
-		<zip destfile="${plugin.destination}/com.ibm.wala.core.tests_1.1.3.200805291132.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
+		<zip destfile="${plugin.destination}/com.ibm.wala.core.tests_1.1.3.200805291132.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false" />
+		<delete dir="${temp.folder}" />
 	</target>
 </project>