per Scott's suggestion factored out two of the map traversals into a macro
per Scott's suggestion factored out two of the map traversals into a macro


angavrilov/olmar,angavrilov/olmar,angavrilov/olmar,angavrilov/olmar