Simplify unmap() impl and make test use file offsets.

#926 part 2