Fix build break due to generalized type parameter bounds