MAP-964: slight enhancement to map rule parser