8172299: Improve class processing

Reviewed-by: rriggs
2 files changed