#326 left over refactoring of id->key.
- lint