[PATCH] Streamline generic_file_* interfaces and filemap cleanups