Replace deprecated macros.
Add E_FileLocator.