Move clauses on non-generic associated types to be implied clauses of the trait. The distinction is not semantically meaningful.