Indeed, that has been my solution. But I'm seeing more and more authentication information being incorporated ("baked in", pre-installed, whatever) into browse

Indeed, that has been my solution. But I'm seeing more and more authentication information being incorporated ("baked in", pre-installed, whatever) into browsers, whether it is lists of "valid" TLD's, certificates for "approved" CA's, or chosen individual website certificates. Personally, I think this information should be cleanly separated from the software that may use it rather than pre-installed and "hidden from the user".