Slight refactor of classloader logic.