Switch mappings to nonrecursive variants