Normalization now handles VarNames and some expr body types