Change maybe-var -> resolve-var to track latest tools.analyzer.jvm