further lint cleanups for MemStore