Further tweaks to RemoveMapNum()

Thanks again to @jeffdoggett!