Change how Infer.hs chooses its map variant.  Also, update submod.