Fix to prevent identity substitutions.
Added ability to fix possessives.