Cleanup of filemap.[ch]