Refactor most Famous usage to the new shim.