keychainprovider cleanup, kindasorta

removed code redundancy, and the query is in the switch thing now, I
didn't put everything into its own separate sources (yet?).
remove special treatment for unified list query

note: the unified query /will/ need special treatment once certs are
joined in, so I am leaving this as an artifact commit for later
reference or point to revert to.