We still don't do unmap-file but this should alleviate the problem somewhat since most commands won't actually use map-file.