CHG: Refactored x-classing to enable profiling with T3 4.5