Rewrite map_check() to me more consistent with our scheme of caller/function respective responsibilities.