Separate weaving from classloading