SPARK-1480: Clean up use of classloaders