changes to reflect refactorings in soot-infoflow