Simplify trait bounds.

This simplfies most trait bounds using a super-trait grouping commont one.