Updating: renaming add3 to mapto2; fixing mishandling of funarg with no annotation.