Add :rpc/query key to defn annotation; change :rpc to :rcp/pre