Better grouping.

Removed CPPText as it causes issues on classes using it.