Merge "Sort node traits in comparisons"