Properly add non-TypeParam constraints