Simplify traits a little.