Cleanup: refactor key-data to use cond->