Revert "Start working on check-based inference."

This reverts commit 4a6f9d6dc27c3a9ed3b433ba5348ec9821f91000.

(I'd just pull it forward and then push everything behind it, but I
can't get the rebase to work to do so.)