@stof / @stloyd proposed fixes (separate interface for adapters providing ListKeys method)