Fixes to highlighting in ClassTooBig. Removed hardcoding.