Traits parser cleanup