Removed distinction between infer and check
Normlization must strip away annots
Added first pass at HOAS