Fix non-scalar constraints support.