Simplify keyserver-checking logic