Refactor queries for device keys and cross-signatures.