Update to Soot 2.5.0.  Remove some cruft that had been accumulating. 
Still needs work for a clean build.