progress through a good portion of porting FMapSubst.