Infer -> Infer-old
Infer2 -> Infer, remove Infer-old
add many missing rules to Infer.hs