Improve remapping warnings.