Tweaks, and reverting searchIMFName for merging.