Refactoring traits and entity classes to split traits up into smaller, more
logical units.