Eliminated the requirement that traits be enumerations, to make it
easier to switch to a database-defined collection approach later.