Tentative smarter classpath handling