Remove some plus signs from trait names.

This will let us distinguish absolute levels (no plus) from modifiers
to an existing level (plus).
Remove a done TODO comment.
merge_traits combines multiple levels of the same trait.