Slight refactor: redundant 'keys_no_hash'