Hot code swap: imporve inner-class handling