sanitation of Infer.

Merge frustration led me to stick to one file for a while.