More work toward the setoid formulation