Fix subtype check for :map. Fixes CTYP-22