Adapted to changes in joern-tools.
And two more spots I missed earlier.