Adapt to latest version of jpf-core