Fixed issues with negation origin sets, and disabled more cancel-infer for now.
Added more queries to case 2b.