Also remap calls to methods which have been remapped.