Code

Flattened class detection. This will be done different in 2.6, actually.