Cleaning up existing structures.

In Skill, CharClass, and Entity.