Rework Java import tracking

No match.