Update tools.analyzer.jvm again after some more enhancements from Nicola