Merge "Remove unnecessary indirection from MemMap."