Fix the inferencer cheats

I had mis-resolved some conflicts with Yong Kiam's recent changes on
master. I think I have it right now.