Moved all trait-related stuff to traitPopulation