Parse trait and class the same.

Don't need all this complicated logic in the parser.
Parse object the same as trait and class.
Further shrinking of rules.