Fix build break due to generalized type parameter bounds

More cargo dependency whack-a-mole