Change to use ClassLoader aware ClassWriter (to assist getCommonSuperClass() class resolution)